RTGOV-192 Fixed other jdk6 build issues, but still need to identify best...

... long term solution