2.1.0 branch at build 2.0.2-824

Change-Id: I3695c6d3fdc95eccd415722114e75df0b79f984a
Reviewed-on: http://review.couchbase.org/26698
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>
Merge remote-tracking branch 'origin/2.0.2' into b210

* origin/2.0.2:
  Revert "MB-8348:added internal setting for use of fadvise in db compactor"

trivial

Change-Id: Iacf9d1a17d6d69571d9141ec0bd52fc1f69a26f1
Merge remote-tracking branch 'origin/2.1.0'

* origin/2.1.0:
  2.1.0 branch at build 2.0.2-824

trivial merge

Change-Id: I333860dd8759b2fb6fef0418f9b41ff5f5df9d28