Update CentOS7 build config
Merge branch 'master' into brix