Merge proposals dependent on lp://qastaging/~cisco-openstack/puppet-openstack-cisco/cis-havana-puppet-inifile

1. cis-havana-puppet-inifile
2. Dependent merge proposals