Changes due to modifications of the spec

Change-Id: I7a200871ca01bdc1d9080eaaac3b5297b09edc49
Reviewed-on: http://review.couchbase.org/29595
Reviewed-by: Aaron Miller <apage43@ninjawhale.com>
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>