Don't force distribute in bootstrap, it's broken
Merge branch 'master' into local-roles