Various deploy from source changes and c-h sync

* openstack-origin is no longer required when using openstack-origin-git.
* Drop kilo from openstack-origin-git default values because upper
  constraints doesn't work in kilo for openstack-dashboard and glance.
* Add flag to allow for disabling upper constraints when using
  openstack-origin-git with user-specified git repositories.

Change-Id: I1a020dcb03716f543d4b5edb201809544365eab2

config.yaml

@@ -33,10 +33,6 @@ options:
 
       NOTE: updating this setting to a source that is known to provide
       a later version of OpenStack will trigger a software upgrade.
-
-      NOTE: when openstack-origin-git is specified, openstack specific
-      packages will be installed from source rather than from the
-      openstack-origin repository.
   openstack-origin-git:
     default:
     type: string
@@ -46,8 +42,6 @@ options:
 
       The default Openstack release name may be one of the following, where
       the corresponding OpenStack github branch will be used:
-        * icehouse
-        * kilo
         * liberty
         * mitaka
         * master
@@ -61,9 +55,7 @@ options:
         - {name: horizon,
            repository: 'git://github.com/openstack/horizon',
            branch: master}
-
-      Note that the installed config files will be determined based on
-      the OpenStack release of the openstack-origin option.
+        release: master
   webroot:
     default: "/horizon"
     type: string