Merge "Fix Yardstick connection issue on virtual env"