Merge "first stage mount: removing the restriction of mount points" into oc-dr1-dev