Sync with master

More accurate, consistent, and efficient managing of config updates.

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