disable to set mount point, as it's unsupported here
Merge branch 'master-patches' of github.com:redhat-openstack/horizon into master-patches

Conflicts:
	openstack_dashboard/local/local_settings.py.example