Merge "Re-enable test_tags" into feature/zuulv3