Upgrade Salt Bootstrap from upstream 2014.8.5
Merge branch 'update/bootstrap'