diff --git a/Gemfile b/Gemfile
index 6b9681f91d..6ce9162802 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,14 @@
 source 'https://rubygems.org'
 
 group :development, :test do
+  gem 'public_suffix', '<= 2.0.5',            :require => 'false'
   gem 'nokogiri', '~> 1.6.0',                 :require => 'false'
   gem 'puppetlabs_spec_helper', '1.1.1',      :require => 'false'
   gem 'rspec', '~>3.3',                       :require => 'false'
   gem 'rspec-puppet', '~> 2.2.0',             :require => 'false'
   gem 'librarian-puppet-simple',              :require => 'false'
   gem 'metadata-json-lint',                   :require => 'false'
+  gem 'puppet-lint', '<= 1.1.0',              :require => 'false'
   gem 'puppet-lint-param-docs',               :require => 'false'
   gem 'puppet-lint-absolute_classname-check', :require => 'false'
   gem 'puppet-lint-absolute_template_path',   :require => 'false'
diff --git a/files/fuel-umm/root/usr/bin/umm b/files/fuel-umm/root/usr/bin/umm
index 90f8d73ee3..3ddc8520e7 100755
--- a/files/fuel-umm/root/usr/bin/umm
+++ b/files/fuel-umm/root/usr/bin/umm
@@ -48,6 +48,7 @@ else
                 echo rebooting >>$UMM_FLAG
                 mkdir -p $UMM_DATA/
                 echo "1" >$UMM_DATA/UMM_ENFORCED
+                service corosync stop || true
                 reboot
             else
                 echo MM already in state - $(cat $UMM_FLAG)
@@ -62,6 +63,7 @@ else
                     rm $UMM_FLAG
                     if [ "x$2" == "xreboot" ] ; then
                         rm $UMM_DATA/UMM_DRC.var
+                        service corosync stop || true
                         sleep 1
                         reboot
                     else