Merge "switch ubuntu|glusterfs|saltstack to new reclass"