Merge branch 'centos_7_compatibility' of github.com:discos/discos into srt-new-minor-servos