Refactor: Prepare source to be squashed

Change-Id: I275dc53298b8cd14df84cb528decfe08be32f68e
Reviewed-on: http://review.couchbase.org/34635
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>