Cirrus: Remove commented officewiki, cawiki to primary

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