Adding overstate support to the salt provisioner

This adds support for salt's overstate, and resolves #2312