Merge branch 'master' of https://github.com/oneilcin/ansible-monasca-schema

Conflicts:
	templates/influxdb_setup.py.j2
Merge branch 'master' of https://github.com/oneilcin/ansible-monasca-schema

Conflicts:
	templates/influxdb_setup.py.j2