Merge "Bug 6714 - Use singleton service in clustered netconf topology" into stable...