renamed config.ini to config.ini.sample
Merge branch 'master' of https://github.com/CiscoSystems/openstack-csr

Conflicts:
	config.ini.33