c++ green!

Commits for making the C++ merge-integration jobs turn green. This may take some a number of iterations, but as mentioned this morning, my plan will be to have many more of them green (if not all!) by the end of the week.