Merge changes from topic 'netconf-clustering'