First batch of updates to remove old SVN tags

Change-Id: Ia5387dfa4a70761a1f9926b4a54525e6cbfa0c3d
Second batch of updates to remove old SVN tags

Change-Id: I5ba0d35ffc0cb0d2c71cd5bbc636ae607cc92c9f
Third batch of updates to remove old SVN tags

Change-Id: Ibadfdb7a1bbb83a92a97b632b2bbf209701aefb0