scm: add merge-base and origin url properties to git

catch exceptions and always remove remote in `mkremote`

Testing Done:
build passes: https://travis-ci.org/cheecheeo/pants/builds/31666560

This is necessary for a feature that will include the merge-base and repository url in pants-built artifacts.

Reviewed at https://rbcommons.com/s/twitter/r/834/