Merge "Add server schema for microversion 2.16"