CBQE-0 add back touch test to sanity and
fix missing parameter in upgrade test

Change-Id: I25a278f2199e0f96011903ce152b71b869e099b6
Reviewed-on: http://review.couchbase.org/36426
Reviewed-by: Tommie McAfee <tommie@couchbase.com>
Tested-by: buildbot <build@couchbase.com>