Ticket #36913 Correct config file and automate post install tasks