Merge "BUG-2254 Make runtime rpcs in config subsystem/netconf handle context-instance...