Merge "SDN-R Sodium compliant mountpoint-registrar"