Bug #7619 - [zh_CN] Localized string broken for Loading page

(cherry picked from commit 7b22e7697f4e8a026bc2dda15454987716421c7c)
fixes #8281 - remove id-name parameterization from puppetca

(cherry picked from commit 3cc348ba459c2c0ff5e41c33ff1f24bc3c3ae379)
Fixes #6974 - Hitting Cancel button on New Org > Manually Assign goes to 404

(cherry picked from commit 1f63475205f367a5ec01ebd8256ec4c546e6acfa)
Fixes #7488 - correctly display hostgroups with / in their names

(cherry picked from commit a08897e1ef0be9087720f8f19fa8326f9256faa2)
Fixes #8321 - correctly pull Compute Resource image method from compute attributes

(cherry picked from commit bde3e87fabeb2006508ee9eddf70f66010b9da74)
fixes #5773 - redirect to referrer URL that includes page and search

(cherry picked from commit e1a2488307d41a0c10e3d4912f735419fe730aba)
Fixes #8325 : Enhance the plugin object to use the gem path to understand where the plugin is installed

(cherry picked from commit aacd8973dbfb89c1c33f7e7afe83b362fb5001c5)
Bug #7547 - Cannot log out of WebUI from mobile device

(cherry picked from commit 405fa5deeed3924c131eff702052d7b496851229)
fixes #5634 - save sso_method on session expiry

(cherry picked from commit fae8b987a8fb329d3cc6a9243e967861d7f5d198)
Fixes #3288 - i18n extract heading on new host view

(cherry picked from commit 27943ec3f2838df9f8ccdd15df332c1507d65373)
Fixes #5169 - Error in smart class param or value cause tab header to turn red in Puppet Class edit form

(cherry picked from commit 3d42bbe5af6ff5201e127ffd5681e9ffb330f909)
Fixes #8418 - Add 'facts' feature to features

(cherry picked from commit a2523ccf030169eaf170c329e2f68193777ab2cb)
Fixes #5573 - os search definitions for host available in unattended=false mode

(cherry picked from commit 7c3c0594afc76abbd6e684ef24c683d9d65e760e)
Fixes #8405 - Filter :interfaces_attributes when calculating templates_used

(cherry picked from commit be4602e87f8a8f35f49c8568fdea41e1570e5bb2)
Fixes #7908 - normalize mac before host get saved

For some reason we save host without running valdiations when we import
attributes from facts. Therefore we have to take care of mac
normalization by ourselves. We have to normalize it just after setting
new value because save can occure anytime.

(cherry picked from commit eaefbecc2052dfea1805b4b7119ae124f823149c)
Fixes #8456 - normalize addresses only if mac is being set

(cherry picked from commit f7bedf484daf4a647afb078666822d25aae0f016)
fixes #8457 - auto complete search clear btn is now positioned correctly

in non index pages which uses auto complete (e.g. filters) the clear
button was not inside the input field.

(cherry picked from commit 1cca8e589ba5dd0e3eb3baa9720002a2ed9be067)

Conflicts:
	app/assets/stylesheets/application.scss
fixes #8445 - upgrade rails to 3.2.21

(cherry picked from commit 082378b7ec529bb2d28e0849d0f566785e2af527)
Release 1.7.0-RC2