Still a release candidate (not yet GA), but seems to work, so we'll
try and update before Spring Cloud is released again.

Fixes gh-546, fixes gh-567, fixes gh-553 (probably)