missing piece of sbt 0.12.4 upgrade

(cherry picked from commit a5deb3ac535be20ad40e1443c7b8a1222e66475d)
Merge remote-tracking branch 'origin/headless' into tortoise