Merge "Update netconf-topology-singleton.xml file formatting" into stable/boron