diff --git a/.travis.yml b/.travis.yml
index d7decac1cf4b8b03522b66c6ae5d24bb7320e7cf..3eb1369174a47061cae90caa0a39a15e9d70af44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
 ---
 language: ruby
 sudo: false
+addons:
+  apt:
+    packages:
+      - libaugeas-dev
 cache: bundler
 bundler_args: --without system_tests
 script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"]
@@ -22,43 +26,43 @@ matrix:
     services: docker
     env: BEAKER_set="debian-6-x86_64-docker"
     bundler_args:
-    script: bundle exec rspec spec/acceptance/*_spec.rb
+    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
     services: docker
     env: BEAKER_set="debian-7-x86_64-docker"
     bundler_args:
-    script: bundle exec rspec spec/acceptance/*_spec.rb
+    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
     services: docker
     env: BEAKER_set="debian-8-x86_64-docker"
     bundler_args:
-    script: bundle exec rspec spec/acceptance/*_spec.rb
+    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
     services: docker
     env: BEAKER_set="ubuntu-12.04-x86_64-docker"
     bundler_args:
-    script: bundle exec rspec spec/acceptance/*_spec.rb
+    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
     services: docker
     env: BEAKER_set="ubuntu-14.04-x86_64-docker"
     bundler_args:
-    script: bundle exec rspec spec/acceptance/*_spec.rb
+    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
     services: docker
     env: BEAKER_set="centos-6-x86_64-docker"
     bundler_args:
-    script: bundle exec rspec spec/acceptance/*_spec.rb
+    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
     services: docker
     env: BEAKER_set="centos-7-x86_64-docker"
     bundler_args:
-    script: bundle exec rspec spec/acceptance/*_spec.rb
+    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
 notifications:
   email: false
 deploy:
diff --git a/Gemfile b/Gemfile
index 0cb59337f154124116d24f05f27feb24e612de7d..1d5497f10b006c73fe8533ca8ae9b8dfd76d8199 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,8 @@ group :development, :unit_tests do
   gem 'puppet-lint-file_source_rights-check',              :require => false
   gem 'puppet-lint-alias-check',                           :require => false
   gem 'rspec-puppet-facts',                                :require => false
-  gem 'github_changelog_generator',                        :require => false, :git => 'https://github.com/raphink/github-changelog-generator.git', :branch => 'dev/all_patches' if RUBY_VERSION !~ /^1.8/
+  gem 'ruby-augeas',                                       :require => false
+  gem 'github_changelog_generator',                        :require => false if RUBY_VERSION !~ /^1.8/
   gem 'puppet-blacksmith',                                 :require => false if RUBY_VERSION !~ /^1.8/
 end
 
diff --git a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
index 679afb04d892bfa2c6e26e8e385e794eef15f07a..3497781c87ffe48b529c89578bafb832026aa275 100644
--- a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
@@ -5,11 +5,11 @@ HOSTS:
       strict_variables:
     platform: el-5-x86_64
     hypervisor : docker
-    image: centos:5
+    image: tianon/centos:5.10
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'yum install -y crontabs tar wget'
+      - 'yum install -y crontabs tar wget which'
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
index 9cab03d08d3affa46d58ead104611bccda490da9..270b9fd03ba3c1ecbee3f9aee6c859d96e8e62ec 100644
--- a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
@@ -9,6 +9,7 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
+      - 'rm -rf /var/run/network/*'
       - 'yum install -y crontabs tar wget'
 CONFIG:
   type: foss
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
index 359dae7dc66e3f7dfd227f9dac947b3381c700d0..ed9e2d8e47da383c875221d3ac0fc105814eb25e 100644
--- a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
@@ -9,7 +9,7 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y wget'
+      - 'apt-get install -y cron locales-all net-tools wget'
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
index fc11f5748abda4a8a4a0c92241b0d0cb5a1f5fdd..1f25d8af33d8491a574279d14edc3e61bce150e7 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
@@ -9,7 +9,7 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y cron wget'
+      - 'apt-get install -y cron locales-all net-tools wget'
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
index 86a55e156924cea2997448b4eb15a5f9d4f53679..097a12d9ab31165abc0f69837608558bfe76d836 100644
--- a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
@@ -9,7 +9,8 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y cron wget'
+      - 'apt-get install -y cron locales-all net-tools wget'
+      - 'rm -f /usr/sbin/policy-rc.d'
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
index f0ec72b86ef254ad92c05db13057dc0531c1eaa6..404833513c23e18b25dc315e0ed5d2000c4fbb25 100644
--- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
@@ -9,7 +9,8 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y wget'
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
index 6fb9281e5d64fb68d1387fbd07d4f34118794413..1339cbd4d02c593acac379638632a65b8b0fd659 100644
--- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
@@ -9,7 +9,10 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y wget'
+      - 'rm /usr/sbin/policy-rc.d'
+      - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
index 2be425c543df7c91f36ab7cb2880c5880a53e4c9..74c8674aa4bc23fecbdb82076b6125139ddd4786 100644
--- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
@@ -9,7 +9,10 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y wget'
+      - 'rm /usr/sbin/policy-rc.d'
+      - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
index caed722c2773332ce02060d2cba6ee3dc627a5fe..4ac8e9ae54d3a33b56fb9c8e04b1399860ef21d7 100644
--- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
@@ -9,7 +9,8 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y wget'
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
 CONFIG:
   type: foss
   log_level: debug