Manta svn->git specific changes.