MB-100: undo unintended consequences of preceding merge

It was clearly not intented to move master back to pre-3.0 compat mode
etc. Preceding merge + this commit = nothing. So we're back to
pre-merge source, yet git will record merge as done. So that next
merges will only consider changes after last merge point.

Change-Id: Ia1df8de967fefa800112fdb0abd62acc623efadd
Reviewed-on: http://review.couchbase.org/29531
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>