Merge "Re-enable test_footer_message" into feature/zuulv3