Fix centos5 reference in Vagrantfile
Rubocop fixes for Vagrantfile
Merge upstream