fixes #7191 - move API response logger to named filter so it can be skipped

(cherry picked from commit 5c631b880310c18cd4ab2b711293bc1c7d3310bd)

Fixes #7157 - Combo box style in reports

(cherry picked from commit ec4108a587d993abbf9f27181628e2a06f868a2d)

Fixes #6161 - Mark override on adding smart variable override via api

(cherry picked from commit 73eb580f9e910736ec797b17ee0cead0dcb12856)

fixes #7035 - expand column name for Rails 3.2.8 compat in Puppet class search

(cherry picked from commit f06b276b93f9ff47ca66174c606fee6fc2c64321)

fixes #7121 - move smart proxy action buttons to helper

refs #7066 - fix syntax error in expression

fixes #7066 - add back $login interpolation for LDAP service account usernames

In cases where an LDAP connection is required outside of the context of user
authentication (e.g. validation of external user group name), an error is
thrown. Users are recommended to use dedicated service accounts for this...

i18n - extracting new, updating rails, pulling from tx

Fixes #7028 - completing api docs for taxonomies

(cherry picked from commit ce690b76c112fc50af8681a655b1f904d345afd2)

Fixes #7056 - only resize textarea in params tab.

(cherry picked from commit 3b25b6b944e57bff97fe8d641e3c4acd07bdcc32)