Fix build on CentOS
Merge branch 'fix-centos2' of github.com:jamesbulpin/xenserver-core into livecd
Remove hard-coded username in upload.sh