Fix for .gitconfig file content and apache_site that was broken in previous lint patch

Change-Id: I390f18eb070201226a422f65a2dfa46a9f32bd61