Merge "Update javadoc for EXTRA_PROVISIONING_ORGANIZATION_NAME" into sc-dev