Merge pull request #926 from bkemper-pentaho/master

Fix the compile error - introduced when imports were fixed, since this references an invalid import at build time.
More warning and format cleanup.   Mostly replace "unchecked" with
"rawtypes" on suppress fields.....