Merge "Javadoc URI permissions handling on Dataset.setContent" into sc-dev