[FAB-6845] Fix broken master

A merge created a CI failure, as the new version dependencies in the MSP
code conflict with the idemix tests, this CR fixes it.

Change-Id: I958f4f4c37a44bc9dbc60b939e7a0236852ae1ae
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

common/tools/idemixgen/idemixca/idemixca_test.go

@@ -93,7 +93,7 @@ func writeSignerToFile(signerBytes []byte) error {
 // with the generated config bytes
 func setupMSP() error {
 	// setup an idemix msp from the test directory
-	msp, err := m.New(&m.IdemixNewOpts{NewBaseOpts: m.NewBaseOpts{Version: m.MSPv1_0}})
+	msp, err := m.New(&m.IdemixNewOpts{NewBaseOpts: m.NewBaseOpts{Version: m.MSPv1_1}})
 	if err != nil {
 		return errors.Wrap(err, "Getting MSP failed")
 	}