diff --git a/other-requirements.txt b/bindep.txt
similarity index 100%
rename from other-requirements.txt
rename to bindep.txt
diff --git a/horizon/files/enabled/jenkins.py b/horizon/files/enabled/jenkins.py
new file mode 100644
index 0000000..7b5247b
--- /dev/null
+++ b/horizon/files/enabled/jenkins.py
@@ -0,0 +1,10 @@
+
+ENABLED = True
+
+DASHBOARD = 'jenkins'
+# If set to True, this dashboard will be set as the default dashboard.
+DEFAULT = False
+# A dictionary of exception classes to be added to HORIZON['exceptions'].
+ADD_EXCEPTIONS = {}
+# A list of applications to be added to INSTALLED_APPS.
+ADD_INSTALLED_APPS = ['horizon_jenkins']
\ No newline at end of file
diff --git a/horizon/files/requirements/liberty_contrail.txt b/horizon/files/requirements/liberty_contrail.txt
index 76e111d..c273fed 100644
--- a/horizon/files/requirements/liberty_contrail.txt
+++ b/horizon/files/requirements/liberty_contrail.txt
@@ -23,7 +23,7 @@
 kombu>=3.0.7
 netaddr!=0.7.16,>=0.7.12
 oslo.concurrency>=2.3.0 # Apache-2.0
-oslo.config>=2.3.0 # Apache-2.0
+oslo.config==1.9.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
@@ -67,6 +67,7 @@
 XStatic-smart-table>=1.4.5.3 # MIT License
 XStatic-Spin>=1.2.5.2 # MIT License
 XStatic-term.js>=0.0.4 # MIT License
+XStatic-QUnit>=1.14 # MIT License
 
 horizon-contrib>=2015.10.0
 
diff --git a/horizon/files/requirements/liberty_vanilla.txt b/horizon/files/requirements/liberty_vanilla.txt
index 190e111..e8321f4 100644
--- a/horizon/files/requirements/liberty_vanilla.txt
+++ b/horizon/files/requirements/liberty_vanilla.txt
@@ -23,7 +23,7 @@
 kombu>=3.0.7
 netaddr!=0.7.16,>=0.7.12
 oslo.concurrency>=2.3.0 # Apache-2.0
-oslo.config>=2.3.0 # Apache-2.0
+oslo.config==1.9.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
@@ -67,6 +67,7 @@
 XStatic-smart-table>=1.4.5.3 # MIT License
 XStatic-Spin>=1.2.5.2 # MIT License
 XStatic-term.js>=0.0.4 # MIT License
+XStatic-QUnit>=1.14 # MIT License
 
 horizon-contrib>=2015.7.6
 python-memcached
diff --git a/horizon/files/requirements/mitaka_contrail.txt b/horizon/files/requirements/mitaka_contrail.txt
index 57e9a31..38b800e 100644
--- a/horizon/files/requirements/mitaka_contrail.txt
+++ b/horizon/files/requirements/mitaka_contrail.txt
@@ -7,36 +7,36 @@
 # be installed in a specific order.
 #
 # PBR should always appear first
-pbr>=1.6
+pbr>=1.6 # Apache-2.0
 # Horizon Core Requirements
-Babel>=1.3
-Django<1.9,>=1.8
+Babel!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3,>=1.3 # BSD
+Django<1.9,>=1.8 # BSD
 Pint>=0.5 # BSD
-django-babel>=0.4.0
-django-compressor>=1.4
-django-openstack-auth>=2.0.0
+django-babel>=0.4.0 # BSD
+django-compressor>=2.0 # MIT
+django-openstack-auth>=2.0.0 # Apache-2.0
 django-pyscss>=2.0.2 # BSD License (2 clause)
-httplib2>=0.7.5
-iso8601>=0.1.9
-netaddr!=0.7.16,>=0.7.12
-oslo.concurrency>=2.3.0 # Apache-2.0
-oslo.config>=3.2.0 # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
+httplib2>=0.7.5 # MIT
+iso8601>=0.1.9 # MIT
+netaddr!=0.7.16,>=0.7.12 # BSD
+oslo.concurrency>=3.7.1 # Apache-2.0
+oslo.config>=3.7.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
-oslo.utils>=3.2.0 # Apache-2.0
+oslo.utils>=3.5.0 # Apache-2.0
 pyScss>=1.3.4 # MIT License
-python-ceilometerclient>=2.0.0
-python-cinderclient>=1.3.1
-python-glanceclient>=1.2.0
-python-heatclient>=0.6.0
-python-keystoneclient!=1.8.0,>=1.6.0
-python-neutronclient>=2.6.0
-python-novaclient!=2.33.0,>=2.29.0
-python-swiftclient>=2.2.0
-pytz>=2013.6
-PyYAML>=3.1.0
-six>=1.9.0
+python-ceilometerclient>=2.2.1 # Apache-2.0
+python-cinderclient>=1.3.1 # Apache-2.0
+python-glanceclient>=2.0.0 # Apache-2.0
+python-heatclient>=0.6.0 # Apache-2.0
+python-keystoneclient!=1.8.0,!=2.1.0,<3.0.0,>=1.6.0 # Apache-2.0
+python-neutronclient!=4.1.0,>=2.6.0 # Apache-2.0
+python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
+python-swiftclient>=2.2.0 # Apache-2.0
+pytz>=2013.6 # MIT
+PyYAML>=3.1.0 # MIT
+six>=1.9.0 # MIT
 XStatic>=1.0.0 # MIT License
 XStatic-Angular>=1.3.7 # MIT License
 XStatic-Angular-Bootstrap>=0.11.0.2 # MIT License
@@ -55,7 +55,6 @@
 XStatic-JQuery.TableSorter>=2.14.5.1 # MIT License
 XStatic-jquery-ui>=1.10.1 # MIT License
 XStatic-JSEncrypt>=2.0.0.2 # MIT License
-XStatic-Magic-Search>=0.2.5.1 # Apache 2.0 License
 XStatic-mdi==1.1.70.1 # SIL OPEN FONT LICENSE Version 1.1
 XStatic-Rickshaw>=1.5.0 # BSD License (prior)
 XStatic-roboto-fontface>=0.4.3.2 # Apache 2.0 License
diff --git a/horizon/files/requirements/mitaka_vanilla.txt b/horizon/files/requirements/mitaka_vanilla.txt
index 696615b..87fd37f 100644
--- a/horizon/files/requirements/mitaka_vanilla.txt
+++ b/horizon/files/requirements/mitaka_vanilla.txt
@@ -7,36 +7,36 @@
 # be installed in a specific order.
 #
 # PBR should always appear first
-pbr>=1.6
+pbr>=1.6 # Apache-2.0
 # Horizon Core Requirements
-Babel>=1.3
-Django<1.9,>=1.8
+Babel!=2.3.0,!=2.3.1,!=2.3.2,!=2.3.3,>=1.3 # BSD
+Django<1.9,>=1.8 # BSD
 Pint>=0.5 # BSD
-django-babel>=0.4.0
-django-compressor>=1.4
-django-openstack-auth>=2.0.0
+django-babel>=0.4.0 # BSD
+django-compressor>=2.0 # MIT
+django-openstack-auth>=2.0.0 # Apache-2.0
 django-pyscss>=2.0.2 # BSD License (2 clause)
-httplib2>=0.7.5
-iso8601>=0.1.9
-netaddr!=0.7.16,>=0.7.12
-oslo.concurrency>=2.3.0 # Apache-2.0
-oslo.config>=3.2.0 # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
+httplib2>=0.7.5 # MIT
+iso8601>=0.1.9 # MIT
+netaddr!=0.7.16,>=0.7.12 # BSD
+oslo.concurrency>=3.7.1 # Apache-2.0
+oslo.config>=3.7.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
-oslo.utils>=3.2.0 # Apache-2.0
+oslo.utils>=3.5.0 # Apache-2.0
 pyScss>=1.3.4 # MIT License
-python-ceilometerclient>=2.0.0
-python-cinderclient>=1.3.1
-python-glanceclient>=1.2.0
-python-heatclient>=0.6.0
-python-keystoneclient!=1.8.0,>=1.6.0
-python-neutronclient>=2.6.0
-python-novaclient!=2.33.0,>=2.29.0
-python-swiftclient>=2.2.0
-pytz>=2013.6
-PyYAML>=3.1.0
-six>=1.9.0
+python-ceilometerclient>=2.2.1 # Apache-2.0
+python-cinderclient>=1.3.1 # Apache-2.0
+python-glanceclient>=2.0.0 # Apache-2.0
+python-heatclient>=0.6.0 # Apache-2.0
+python-keystoneclient!=1.8.0,!=2.1.0,<3.0.0,>=1.6.0 # Apache-2.0
+python-neutronclient!=4.1.0,>=2.6.0 # Apache-2.0
+python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
+python-swiftclient>=2.2.0 # Apache-2.0
+pytz>=2013.6 # MIT
+PyYAML>=3.1.0 # MIT
+six>=1.9.0 # MIT
 XStatic>=1.0.0 # MIT License
 XStatic-Angular>=1.3.7 # MIT License
 XStatic-Angular-Bootstrap>=0.11.0.2 # MIT License
@@ -55,7 +55,6 @@
 XStatic-JQuery.TableSorter>=2.14.5.1 # MIT License
 XStatic-jquery-ui>=1.10.1 # MIT License
 XStatic-JSEncrypt>=2.0.0.2 # MIT License
-XStatic-Magic-Search>=0.2.5.1 # Apache 2.0 License
 XStatic-mdi==1.1.70.1 # SIL OPEN FONT LICENSE Version 1.1
 XStatic-Rickshaw>=1.5.0 # BSD License (prior)
 XStatic-roboto-fontface>=0.4.3.2 # Apache 2.0 License
@@ -64,7 +63,3 @@
 XStatic-term.js>=0.0.4 # MIT License
 
 horizon-contrib>=2015.10.0
-
-# metadata update needs
-functools32==3.2.3-2
-jsonpointer==1.10
\ No newline at end of file
diff --git a/horizon/server/multi/init.sls b/horizon/server/multi/init.sls
index 63fa6f4..dcf8b74 100644
--- a/horizon/server/multi/init.sls
+++ b/horizon/server/multi/init.sls
@@ -2,6 +2,6 @@
 {%- if server.enabled %}
 
 include:
-- horizon.server.multi.service_git
+- horizon.server.multi.service
 
 {%- endif %}
diff --git a/horizon/server/multi/service_git.sls b/horizon/server/multi/service.sls
similarity index 100%
rename from horizon/server/multi/service_git.sls
rename to horizon/server/multi/service.sls
diff --git a/horizon/server/multi/site.sls b/horizon/server/multi/site.sls
index 178d5fb..4dc8595 100644
--- a/horizon/server/multi/site.sls
+++ b/horizon/server/multi/site.sls
@@ -54,8 +54,12 @@
   git.latest:
   - name: {{ app.source.address }}
   - target: /srv/horizon/sites/{{ app_name }}/extra
+  {%- if grains.saltversioninfo.0 > 2015 %}
+  - rev: HEAD
+  - branch: {{ app.source.revision }}
+  {%- else %}
   - rev: {{ app.source.revision }}
-  - depth: 1
+  {%- endif %}
   - submodules: True
   - require:
     - virtualenv: /srv/horizon/sites/{{ app_name }}
@@ -255,7 +259,12 @@
   {{ plugin.source.engine }}.latest:
   - name: {{ plugin.source.address }}
   - target: /srv/horizon/sites/{{ app_name }}/plugins/{{ plugin_name }}
+  {%- if grains.saltversioninfo.0 > 2015 %}
+  - rev: HEAD
+  - branch: {{ plugin.source.revision }}
+  {%- else %}
   - rev: {{ plugin.source.revision }}
+  {%- endif %}
   - submodules: True
   - require:
     - file: /srv/horizon/sites/{{ app_name }}/plugins