Tweak build for 2.11.0-M8 release.