Revert "Cirrus: Remove commented officewiki, cawiki to primary"

Bah, merged too early. Don't want this yet.

This reverts commit 1a44fb0f5e850237247e90b9c5df29bd39a4dae1.

Change-Id: Id5039636a48e63b63264737c4e419f5a2666135b
Merge "Revert "Cirrus: Remove commented officewiki, cawiki to primary""