Fix for merge issue (#4141)
Fix for merge issue (#4141)


couchbaselabs/sync_gateway,ceejatec/sync_gateway,couchbaselabs/sync_gateway,couchbaselabs/sync_gateway,couchbaselabs/sync_gateway,ceejatec/sync_gateway,ceejatec/sync_gateway,ceejatec/sync_gateway