Remove .shifter.json references
Merge branch 'master' into 2.0.x