Bug fixes:
----------

* Fix --skip-existing (was not matching output-dir/croot locations correctly)  #2192
* Fix numpy x.x getting .* appended, resulting in unsatisfiable numpy  #2193