Switch to running 1 epum and 1 provisioner by default
Merge branch 'master' into phantom0.2