CFY-642 fixed agent installer prepare_configuration
Merge remote-tracking branch 'origin/develop' into develop