Merge "Remove unwanted capabilitiy from the java-doc" into pi-dev