Moving back to puppetlabs/puppetlabs-glance/master

The reason we forked this for folsom is in the upstream puppet module

Change-Id: I8f8b8e7593615bdf21c60f9b3182e7669f5df7b3
Moving back to cprice-puppet/puppetlabs-inifile/master

The reason we forked this for folsom is in the upstream puppet module

Change-Id: Ic63b14b1826c7ac35ae6f5cd6f13d84a15866f39
Merge "Moving back to puppetlabs/puppetlabs-glance/master"
Merge "Moving back to cprice-puppet/puppetlabs-inifile/master"