Fix bug highlighted by test case failure after r1635154. If the webappPath is null, the resourcePath should be null. Also fix some Java8 Javadoc issues.