Merge "Use Cirros 0.5.1 in scenario jobs for all branches"