WIP: separate create_or_update.

Tests does not pass; need wsgi changes.

Change-Id: I664b3f7b0fdb1f084499d4994bd5f58442e6ec21