Merge "Use glusterfs ppa repo in drivetrain_ha"