CBQE:0 Minor changes to system test files

Change-Id: Ide3978756eaf4841a372b89a3930c4a72e7fe903
Reviewed-on: http://review.couchbase.org/36578
Reviewed-by: Aruna Piravi <aruna@couchbase.com>
Tested-by: Aruna Piravi <aruna@couchbase.com>