merged work already deployed to master
EB-7491: Tweaks to catalog filtering and index
Fixed merge issue causing compilation problem.
removed eclipse config files
merged hardening_r16 changes