accept macports as well as brew node locations
Merge remote-tracking branch 'upstream/master' into java_bootstrap_rewrite