Merge "Mark project and user options as required for LsUserRefs" into stable-2.6