Update build.jsons to work with Shifter 0.4.0.
Merge branch 'dev-master' into dev-3.x