fixes #2639 After creating user with empty e-mail it becomes impossible to add it.
(cherry picked from commit 802ae177dc9d35c3fc3889fa34b24e7f32001eb8)

fixes #2660 - settings, improve tests and fixes

- added string settings type
- fixed tests previously commented out due to CI failures
- more tests for core settings functionality
- parsing of string values enhanced and extracted to a separate method
- setting value to nil when it equals default is back...

fixes #2334 - location matcher doesn't match on smart parameters
(cherry picked from commit c7f527779d80e1cc78e1f3b02a6ba7bfc081a95d)

fixes #2631 - fix remote code execution via controller name (CVE-2013-2121)
(cherry picked from commit ef4b97d177c58c9532730d53dca0517bc869a0ce)

Conflicts:
app/views/common/_puppetclasses_or_envs_changed.html.erb

fixes #2630 - restrict assignment of roles to those a user has (CVE-2013-2113)
(cherry picked from commit bae665de387d63f93740670ec2542db90084d0eb)

Fixes #2038 - updated config and partition table templates using ones from the community repository
(cherry picked from commit cb92c0be69a00142158d884e05097b47d20480da)

fixes #2386 - permission failure on create_lookup_value
(cherry picked from commit 6c492cce87e0f2ec6c9f4a15115f4394ce542979)

Fixes #2615 - failed to save host group

If there was current organization selected, organizations got doubled
which prevented save. Fixed and added test for this part.
(cherry picked from commit 410505f49b09e8b9295551e5b2ff9f7fe95add6e)

fixes #2285 - subnet validation - length of addresses, strip whitespace and fix common typos
(cherry picked from commit 31aa5db511a6decf800e68a2b6f6eb3dbf0ae29c)

fixes #2602 - scoped_search error when using postgresql
(cherry picked from commit 93ce3a18eea3bd04b09dc7b55a5c513f973736f5)