fixes for mirror reorganization

Change-Id: Ib43df2ce7f5f15ccb1d42d860ac320b77213fdb5
35 files changed