Git 1.7.5.4

Again, this is nothing earth-shattering, but just to back-merge various user-facing fixes we have for upcoming 1.7.6 to 1.7.5.X maintenance series, while updating the test suite for developers to match the master branch more closely.