Merge changes Ia2c927be,I4ff433f5

* changes:
  Fix BuildTest when running on development versions.
  Revert "BuildTest: split out test expected to fail on prerelease builds"