Merge "Fix BuildVersionTest#testReleaseVersion" into jb-dev