Generic pilot model configuration
Also sync with development repo.
Authored by: stuartbuchanan 2020-05-25
Parent: [r4897]
Child: [r4899]