Merge "Fix PackageTest#testSinglePackage" into jb-dev