FEND-809: hand merge the code
Merge branch 'master' into dev/FEND-809
FEND-809: hand merge the code
Merge branch 'master' into dev/FEND-809
FEND-809: Change "Find this article online" display functionality..fixing the unit test
FEND-809: Change "Find this article online" display functionality.
Merge remote-tracking branch 'origin/dev/FEND-809' into release/2.6.3rc