Merge "Make tempest's python 2.6 policy clear"