Merge branch 'master' of https://github.com/pestaa/cdist
Conflicts: conf/type/__start_on_boot/gencode-remoteremotes/origin/2.0
commit
cd5050cc91
Conflicts: conf/type/__start_on_boot/gencode-remoteremotes/origin/2.0