Merge "Bug 1948: Separate out restconf features."