SCHEMA-155. Merged Kiji and KijiAdmin.