Merge "Javadoc changes for additional DPC-settable extras" into sc-v2-dev