Roll up of local changes to work with gitlab 6.0.1 on CentOS 6