CBSE-811:  2.1.1 uses override-2.1.1.xml

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