Merge "Change saltstack repo class from trusty to xenial"