MB-9000:  3e43610959a9c959a8a8ad6b6b1e3fa8cc0bb157
MB-9015:  2d911f9ca320fc7e6ed148858b1318d93da0113f

Change-Id: I126ed1d7f52d5141c46947b8b1768e7e3b6f59b4
Reviewed-on: http://review.couchbase.org/28773
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>