Merge pull request #1 from theforeman/master

Resync with theforeman's github
Merge pull request #2 from theforeman/master

Resync with theforeman's github
Add support for options 'ssldir' and 'puppetdir'

This is useful if the puppetmaster configuration and/or ssl directory was
installed in non-standard locations.
Merge commit 'bd1e35d2ee69beec07bf119a9954f282906efee1' into stable