Merge remote-tracking branch 'shared/master'

Conflicts:
	manifests/init.pp

diff --cc manifests/init.pp
index 312e0b81646921ff6c3b74fa9c1a10088b2c7342,c55409ff8dbde7848c2b2b5a0327277e43cf3c5d..85b34e1f301eaef301e33951c71b28fda6303af0
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -1,6 -1,6 +1,6 @@@
  class lsb {
 -  case $operatingsystem {
 +  case $::operatingsystem {
-     debian: { include lsb::debian }
+     debian,ubuntu: { include lsb::debian }
      centos: { include lsb::centos }
    }
  }