Fixed hierarchicalFacetHelper tests.
Merge commit 'b9a98fcc1dd1460a8e57dca5dab24bcb44ccd7ff'

Conflicts:
	themes/bootprint3/css/compiled.css
	themes/bootstrap3/css/compiled.css
Merge commit '05b26a500cddeeb30d54fdb4d601bd76610c8693'

Conflicts:
	themes/bootprint3/css/compiled.css
	themes/bootstrap3/css/compiled.css