Reverting 22c8dec5 and preventing bootstapping in scaladoc
Reverting 22c8dec5 and preventing bootstapping in scaladoc

Review by @dragos, @jsuereth. Required bootstrapping because the starr was
ant tasks were invoking locker with -Ysourcepath instead of -sourcepath.

som-snytt/scala-partest,SethTisue/scala-partest,lrytz/scala-partest,scala/scala-partest,scala/scala-partest