Merge "Adding ability to pass salt version in bootstrap"