Update upr-branch with cmake changes

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