NCBC-246: Update codebase to be v3.5 compatible

Change-Id: If0d420416d023f83657194e4b0c2c902a167d19d
Reviewed-on: http://review.couchbase.org/25472
Reviewed-by: Saakshi Manocha <saakshi.manocha@globallogic.com>
Tested-by: Saakshi Manocha <saakshi.manocha@globallogic.com>