Fifth batch of updates to remove old SVN tags

Change-Id: I515be78b979649e2bcda81f1bfb047559e701095