Merge "Fix javadoc for some user restrictions." into oc-dev