Merge "Fix installation of testapi in virtualenv"