Merge "Adding python unittests for apex/virtual/*" into stable/euphrates