[FAB-4145] intermittent e2e failure in fabric verify

Adding diagnostic logging and renaming the chaincode to a more
unique name to avoid running conflicts with other end2end tests
in the CI environments.

Change-Id: I7bf432f84e695ce95a0d6caace464cc5d76be9f9
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>

test/integration/e2e/e2eUtils.js

@@ -253,6 +253,16 @@ function instantiateChaincode(userOrg, chaincode_path, version, upgrade, t){
 			let request = buildChaincodeProposal(client, the_user, chaincode_path, version, upgrade, badTransientMap);
 			tx_id = request.txId;
 
+			t.comment(util.format(
+				'Upgrading chaincode "%s" at path "%s" to version "%s" by passing args "%s" to method "%s" in transaction "%s"',
+				request.chaincodeId,
+				request.chaincodePath,
+				request.chaincodeVersion,
+				request.args,
+				request.fcn,
+				request.txId
+			));
+
 			return channel.sendUpgradeProposal(request)
 			.then((results) => {
 				let proposalResponses = results[0];

test/unit/util.js

@@ -37,7 +37,7 @@ module.exports.CHAINCODE_UPGRADE_PATH = 'github.com/example_cc1';
 module.exports.CHAINCODE_MARBLES_PATH = 'github.com/marbles_cc';
 module.exports.END2END = {
 	channel: 'mychannel',
-	chaincodeId: 'end2end',
+	chaincodeId: 'end2endnodesdk',
 	chaincodeVersion: 'v0'
 };