diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index cadbaa9..4e028f1 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -6,12 +6,16 @@
     openstack_rabbitmq_port: 5672
     openstack_rabbitmq_x509_enabled: False
     rabbitmq_ssl_enabled: False
+    ceilometer_agent_ssl_enabled: False
   ceilometer:
     agent:
       region: ${_param:openstack_region}
       enabled: true
       version: ${_param:ceilometer_version}
       secret: ${_param:ceilometer_secret_key}
+      libvirt:
+        ssl:
+          enabled: ${_param:ceilometer_agent_ssl_enabled}
       identity:
         engine: keystone
         host: ${_param:keystone_service_host}
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index 3803d12..dc75fc5 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -6,8 +6,12 @@
     openstack_rabbitmq_port: 5672
     openstack_rabbitmq_x509_enabled: False
     rabbitmq_ssl_enabled: False
+    ceilometer_agent_ssl_enabled: False
   ceilometer:
     agent:
+      libvirt:
+        ssl:
+          enabled: ${_param:ceilometer_agent_ssl_enabled}
       identity:
         protocol: ${_param:internal_protocol}
       message_queue:
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index 56ca6cc..a110361 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -6,12 +6,16 @@
     openstack_rabbitmq_port: 5672
     openstack_rabbitmq_x509_enabled: False
     rabbitmq_ssl_enabled: False
+    ceilometer_agent_ssl_enabled: False
   ceilometer:
     agent:
       region: ${_param:openstack_region}
       enabled: true
       version: ${_param:ceilometer_version}
       secret: ${_param:ceilometer_secret_key}
+      libvirt:
+        ssl:
+          enabled: ${_param:ceilometer_agent_ssl_enabled}
       identity:
         engine: keystone
         host: ${_param:keystone_service_host}
diff --git a/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
index a5fcd51..0f87d73 100644
--- a/ceilometer/agent/telemetry/single.yml
+++ b/ceilometer/agent/telemetry/single.yml
@@ -6,8 +6,12 @@
     openstack_rabbitmq_port: 5672
     openstack_rabbitmq_x509_enabled: False
     rabbitmq_ssl_enabled: False
+    ceilometer_agent_ssl_enabled: False
   ceilometer:
     agent:
+      libvirt:
+        ssl:
+          enabled: ${_param:ceilometer_agent_ssl_enabled}
       message_queue:
         port: ${_param:openstack_rabbitmq_port}
         x509:
diff --git a/jenkins/client/job/deploy/update/reclass_update_check.yml b/jenkins/client/job/deploy/update/reclass_update_check.yml
new file mode 100644
index 0000000..cec8d79
--- /dev/null
+++ b/jenkins/client/job/deploy/update/reclass_update_check.yml
@@ -0,0 +1,51 @@
+#
+# Jobs to to check new Reclass package version compatibility with model
+#
+parameters:
+  _param:
+    jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+  jenkins:
+    client:
+      job:
+        check-reclass-version:
+          type: workflow-scm
+          concurrent: true
+          discard:
+            build:
+              keep_num: 10
+            artifact:
+              keep_num: 10
+          display_name: "Upgrade - check new Reclass package"
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            branch: "${_param:jenkins_pipelines_branch}"
+            credentials: "gerrit"
+            script: test-reclass-package.groovy
+          param:
+            SALT_MASTER_URL:
+              type: string
+              default: "${_param:jenkins_salt_api_url}"
+            SALT_MASTER_CREDENTIALS:
+              type: string
+              default: "salt"
+            DISTRIB_REVISION:
+              type: string
+              default: 'proposed'
+              description: "Mirror version to use"
+            EXTRA_REPO_PREDEFINED:
+              type: boolean
+              default: false
+              description: "Use mcp extra repo defined on host"
+            EXTRA_REPO:
+              type: string
+              default: ''
+              description: "Extra repo to use in format (for example, deb [arch=amd64] http://apt.mirantis.com/xenial/ nightly extra)"
+            EXTRA_REPO_GPG_KEY_URL:
+              type: string
+              default: ''
+              description: "GPG key URL for extra repo"
+            TARGET_NODES:
+              type: string
+              default: '*'
+              description: "Target specification, e.g. 'I@openssh:server'"