removing $svnkey entries and fixing style errors

Change-Id: I846181c92bbf6b8ce01baa0a1265eccb4a880108
Merge "removing $svnkey entries and fixing style errors" into production