Merge "Re-enable zuultrigger test" into feature/zuulv3