fixes #2772 cloning locations and organizations is broken
(cherry picked from commit 532d961537f8cd639a4b35f35ed4e6210a3ba83c)
fixes #2782 - LDAP password overwritten as blank
(cherry picked from commit 6a44fab1a948116e93b4690996ae92cfc5d8db03)
fixes #2791 - ptable api was missing :layout and :os_family
(cherry picked from commit 774ed2d2ac6af23369eafa7658b0a446f3b63adf)
fixes #1770 - Refactored rdeckfacts definition to use facts_hash
(cherry picked from commit 86e9a056e5a1d24b9532674d5f14762a1bd9ab78)
fixes #2779 - permission problem with non-admin adding puppetclasses to hosts and hostgroups
(cherry picked from commit 05fbe52cacb64700af76f8f072b2ff5cd16c23cc)
fixes #2797 - Submit the final code, not the diff in the config template editor
(cherry picked from commit 99b2e61bed1474451fdef1852d484f009dc4cb2f)
fixes #2808 - pin nokogiri to 1.5.x for Ruby 1.8
(cherry picked from commit 0b547e84f7342cbb809ffe5e1f171c0f4b1e8f05)
fixes #2373 - only reference unattended subnet path when in unattended mode

(cherry picked from commit 754e83c1667ab7af677064f468354d325f59c36f)
Fixes #2826: only run set_code() on submit if the config template editor is already in diff mode

(cherry picked from commit ceabd2b37d1924a45ee20de100d0e5cb8f39845d)
fixes #2801 - remove LOWER() in default_scope of models that could cause PG error

(cherry picked from commit 60e2072a7751819b1d870681294e3feff3de3cbf)
fixes #2693 - don't cause handle_ca error when no Puppet CA associated with host

(cherry picked from commit f09d61de451450a566c7ee16bdf35281e98708c4)
Fixes #2839 - retry SSH authentication issues with cloud-init

(cherry picked from commit f9d5655583a9a9d0309fcd4bd19ac9b43021c7d1)
fixes #2837 add an interface to add repositories to kickstart

(cherry picked from commit 6b27556aafbd98f3a0f0bb092fbbc49a6bb587e1, minus cleanups)
fixes #2788 - adding / removing puppet classes updates the change even if the form is not submitted

(cherry picked from commit 0ba99bba2c7496fd44822dd5f2e6b4ccda19177b)
fixes #2788 - changes to fixtures and tests in preparation for testing adding/removing puppetclasses

(cherry picked from commit 1ef5ee75d794f024c75d6be96ac04ff398118e26)

Conflicts:
	test/fixtures/lookup_keys.yml
fixes #2851 - refresh puppet classes on environment change

(cherry picked from commit 241ed0a35571062cf7fc6489dc31f3b26f3edd78)
Update test fixtures, partial backport of 248cad83
added a HTML id to the operating system ui tab

similar to the id we have in the host and hostgroup forms,
this change makes the ui plugin code look clean.

(cherry picked from commit 13923d499d1cc68a9e8f35734bf2e973c712784e)
fixes #2872 - default password not listed in debug script

(cherry picked from commit 6e6f246cf315c9c109e65d173db4012809b738cc)
Release 1.2.1