Develop

Pushed changes for story 5692

Also pushed minor changes for story 5656 (changes to config-example* folders)