Sync inifile with upstream

v1.1.3 41e2ddbc1cd861247e57d16b778cbe891602f509
Partial blueprint merge-openstack-puppet-modules

Change-Id: Idd6b512a4adafc31cd0c80ccf0ca59a18b43d98e
Merge "Sync inifile with upstream"