Merge "Fix javadoc links to permissions" into sc-dev