SHDP-211 Compile fixes

- Fixing jdk6/jdk7/jdk8 build issues for tests
  and javadocs.