backport 41307 to 2016.11, properly pack version numbers into single number
backport 41307 to 2016.11, properly pack version numbers into single
number

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt