Fuse eclipse 946 r1

This should help the master diff quite alot.  Removed the ^Ms from windows edits from java source files.

No other changes with this PR - just ^M removal.