Merge "Heat autoscaling scenario test"