Merge branch 'snf_gitignore' into snf_openstack_v2.0

Conflicts:
	.gitignore
Use Constants.PROPERTY_API_VERSION instead of apiVersion()
Merge branch 'snf_openstack_v2.0' into snf_getIpAddress