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

(cherry picked from commit f06b276b93f9ff47ca66174c606fee6fc2c64321)
Fixes #6161 - Mark override on adding smart variable override via api

(cherry picked from commit 73eb580f9e910736ec797b17ee0cead0dcb12856)
Fixes #7157 - Combo box style in reports

(cherry picked from commit ec4108a587d993abbf9f27181628e2a06f868a2d)
fixes #7191 - move API response logger to named filter so it can be skipped

(cherry picked from commit 5c631b880310c18cd4ab2b711293bc1c7d3310bd)
Fixes #7079: foreman-debug archive now includes contents of /etc/foreman-proxy/settings.d directory

(cherry picked from commit 4aff3f071a2326a3cd4923b95bdfe87b3371184d)