Merge branch 'dalcinl/options-yaml' into 'master'

Enhancements to YAML options

See merge request petsc/petsc!3629

YAML: Inserting all files/strings seen in other files and command line