JC-1509 Added tests.
JC-1425 Removed spaces from jsp pages.
Merge remote-tracking branch 'origin/JC-1425'
Merge remote-tracking branch 'origin/master'