Upgrade to new Mock

Change-Id: I59bb2ca373e68443526cf0eda4c15fbab6c4ba9f
Reviewed-on: http://review.couchbase.org/32982
Reviewed-by: Brett Lawson <brett19@gmail.com>
Tested-by: Mark Nunberg <mnunberg@haskalah.org>