Merge "ControllerContext.dataNodeChildByQName method refactoring"