Bump version to 3.1
Bump version to 3.1
Bump version to 3.1
Bump version to 3.1
Merge branch 'master' into CFY-1746-nodecellar-upgrade

Conflicts:
	openstack-blueprint.yaml