CB-7987 Added "cordova-" prefix to all slave names.
Merge remote-tracking branch 'apache/master' into buildbot

Conflicts:
	master.cfg