JGRP-1893 for 3.5

New try. I had not disabled Eclipse's save actions which performed auto indentation causing white space changes. If this PR looks ok, I will do the same for other branches.

Regards,
Tero