some more build fixes

now i'm really-really done

really

review by @paulp 

------

ps: for those who skim commit messages, today's protip says:

I recommend creating a build.properties file as follows:

```
locker.skip=1
starr.use.released=1
```

This will download the Scala version specified in starr.number,
use it to build quick, skipping locker.