Only have to wait for daemons to die if we are doing cross version tests.
GRADLE-2980 - respect a custom maven local location for publishToMavenLocal task.

This was a regression caused by GRADLE-2762.