Sync with bitbucket ogirinal (https://bitbucket.org/jsosic/puppet-cobbler)