Merge "Fix restconf-provider blueprint"