formatting
Merge branch 'master' into dev/FEND-830
FEND-830: Filter by Article Type improvements...search page is still broken
FEND-830: Filter by Article Type improvements...fixing unit test
FEND-830: Filter by Article Type improvements.
Merge branch 'master' into dev/FEND-830
Merge branch 'master' into dev/FEND-830
Merge remote-tracking branch 'origin/dev/FEND-830' into release/2.6.8rc