Merge "Optionally bind /lib64" into feature/zuulv3