Merge "Fix tempest_lib import order"