Merge "Remove layoutvalidator" into feature/zuulv3