First whack but erroneously used RedHat
Creates XFS and Gluster bricks on Ubuntu
Merge branch 'master' into cs/gluster

Conflicts:
	hosts/dev