refs #2816: Prevent diff viewer on report page from overflowing to be outside the parent modal

(cherry picked from commit 76ab06280f6ebe78b358763deff233c277ed2c61)
refs #2314 - more choices in memory drop down

(cherry picked from commit f7d5a22e0fd28c3689273c03b652d91b6ed661ae)
fixes #4220 dashboard and report-show pages chart-frame is not in place.

(cherry picked from commit cbce647fa4d83b5ea4f5a5d35313914811a4e891)
fixes #4234 - cannot edit host's puppet parameters

(cherry picked from commit 130f301a508ae31549145e5fa9b176f42dc20995)
fixes #2726 - smart class parameter override fails validation

(cherry picked from commit cfc2bb662f49d8216c2388ab35dd87af295474d0)
fixes #4304 - corrected strange search for host_id parameter

(cherry picked from commit e72b0a7748d9eeec537bfe9b5da202432b243ba2)
fixes #4298 - ldap auth should accept parens in firstname or surname

(cherry picked from commit 3065cbc2df440c77e20abeed9fa525221fdcb12f)
fixes #3519 - taxonomies include authorization module

(cherry picked from commit 14fdd9046dd3b85979bf95b4d0019e00051e35c2)
fixes #3980 - Compute profiles not rendering Openstack attributes correctly

(cherry picked from commit 88daf556e39ad9c0d3bdebbe9f88ce5ff49010f6)
fixes #3496 vSphere: add support for selectable SCSI controller

(cherry picked from commit 41ee835f2c872d09cd09af2179ef3bc2327e6b02)
fixes #4307 New VMware VM creation does not respect NIC type selection

(cherry picked from commit 461e6b003bc00d6d62e20d8f1c5e5c860ebdaaba)
fixes #4159 Thin provisioning for VMware disks in compute profiles can't be saved

(cherry picked from commit 2058a91d5effb143a66f5677d6882cba4a9258ae)
fixes #3596 - validation error when user with hostgroup subscription creates a new hostgroup

(cherry picked from commit de7cb88710f028bc33ae9257d185abf0b73554d5)
fixes #3903 - fixed menu links when relative URLs are set

(cherry picked from commit 9b6e45e951a8287f2edab48ebd20f18680671abf)
fixes #3845 - user login session ending clears chosen organization

(cherry picked from commit f639fdcfb04d2795396d66e64cfb58e300a63188)
Fixes #4221: add :dependent => :destroy for compute profiles on compute resource

(cherry picked from commit 6e7682a967c9e3dc37d244146b22d7dc2cb7103e)
fixes #4268 - don't search for host with nil IP on hostname spoofing

(cherry picked from commit 1e0fd283180dc6bda30c880898cdea69cb579194)

Conflicts:
	test/fixtures/hosts.yml
fixes #3567 Editing an oVirt compute resource can throw errors loading quotas while loading page

(cherry picked from commit 2e66b04a2c92bc40fea1bfdc7f0414435754f49b)
fixes #4125 [Openstack] - host with auto assigned IPs can't be deleted

(cherry picked from commit fd3f24f8e05d8f4ab64bc61168fc4e0ead455025)
Fixes #2270 - Detect all OpenStack IPs and test which allows SSH

(cherry picked from commit 1b110b37dd4a332ee0682e33daaaa848da8bcad7)