Story 428: update schemas to latest revisions

Change-Id: I6c289dc99bf212cd3ec266d6501bd9a90656e047
Merge "Story 428: update schemas to latest revisions"