cbsasl path fix

Change-Id: I77b1138fa7e6b92888ea384042b91f54caa59177
Reviewed-on: http://review.couchbase.org/28804
Reviewed-by: David Liao <david.liao@couchbase.com>
Tested-by: David Liao <david.liao@couchbase.com>
Add an upr branch for upr work

Change-Id: I33aadfc380de05b1768c9b4819c1259ac3d306ae
Reviewed-on: http://review.couchbase.org/28805
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>