Merge "Allow xAppMgr to manipulate xApp configmap"