Fix for unreliable _IS_OLD check on Octopus instances upgrade.
Merge branch 'refs/heads/master' into 2.2.x-legacy