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)