kiwix use generic::systemuser

Change-Id: If70502796a8d54912a3647e841be779844256ca6
Merge "kiwix use generic::systemuser" into production