Merge Salt bootstrap 1.5.9 release