ensure correct navigation ids in client for all site groups

temporary workaround until the sites tables can be re-populated

Change-Id: I84f93ad18485e6175dc4ff3cff103a8b6db76fe2
Merge "ensure correct navigation ids in client for all site groups" into mw1.22-wmf16