More selectively fix ignoring conflicted artifacts.
Add options for makeSymLinks and overwriteMode.
Merge branch 'avoid_conflicts' into bizo

* avoid_conflicts:
  More selectively fix ignoring conflicted artifacts.
Merge branch 'more_retrieve_options' into bizo

* more_retrieve_options:
  Add options for makeSymLinks and overwriteMode.