fixes #3005 - restrict gettext to Ruby 1.8 compatible version
fixes #1745 - make puppetmaster hostname/domain stripping behaviour configurable
Fixes #2758 - Reset key_type when importing parameter defaults
fixes #3010 - use the correct helper function name
fixes #2860 - don't convert arbitrary input into symbols (CVE-2013-4180)
fixes #2863 - restrict APIs to resources that a user is permitted to manage (CVE-2013-4182)
Merge branch 'develop' of https://github.com/theforeman/foreman into preproduction
Merge branch 'develop' of https://github.com/theforeman/foreman into preproduction
Updated logout methods