t831 / t833 - various views exposed filter cleanups.
Merge remote-tracking branch 'origin/7.x-4.x-admin_interface_phase2_conflict' into 7.x-4.x-admin_interface_phase2
resolving Views conflicts from merge.