Merge micjahn  with mikej06
Fix corner case for javadoc redirector