Merge "Changed mount point URI decoding in restconf"