Fix provision issues with centos
Merge remote-tracking branch 'origin/2.1' into 2.1