Fix eclipse warnings
@rev rsalvador@
Merging origin/amcculloch/master-pending/eclipseErrors into master