MB-10374:  use commit:  009c4325f40e04700ca7956e866ad342f020e214
           from branch old-master:
           remove extra comma and end of enum

Change-Id: Ia877d313f39986fa6ac7cb2702608255c5670148
Reviewed-on: http://review.couchbase.org/34253
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>