Merge "Bugfix: yardstick https support"