Merge changes Ib0fdae2e,Ib8b9e0f8 into nyc-dev

* changes:
  Handle symlinked OUT_DIRs (again)
  Handle out being a symlink