Set text encoding. #2744
Add child and ad-hoc to prepoulator list. #2744
Adapt child and adhoc prepopulator spec to use new prepopulator. #2744