Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev