Upgrade to build tools 21.1.1
Tweaks for the Devoxx demo