MB-8145: unbreak bucket auth

Change-Id: I99bf063b4397002eb02b748aced6e6fbb481cc55
Reviewed-on: http://review.couchbase.org/28079
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Merge remote-tracking branch 'origin/2.2.0'

* origin/2.2.0:
  MB-8145: unbreak bucket auth

this is trivial merge

Change-Id: I14cd006e2fb7d456505dd3e1d16f3a8893ef3591