Merge branch 'jh/push-default-upstream-configname' * jh/push-default-upstream-configname: push.default: Rename 'tracking' to 'upstream'