[FAB-2257] Fix local orderer startup

https://jira.hyperledger.org/browse/FAB-2257

In fixing the orderer docker startup, the orderer.yaml file was modified
to include the LocalMSPDir.  This was required because without the
variable in the yaml, the environment variable would not take effect.
However, this orderer.yaml variable was incorrectly set to ../msp when
it was being set as a default in code to ../msp/sampleconfig.  This CR
fixes that.

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

images/testenv/Dockerfile.in

@@ -3,6 +3,8 @@ FROM hyperledger/fabric-buildenv:_TAG_
 # fabric configuration locations
 ENV PEER_CFG_PATH /etc/hyperledger/fabric
 ENV ORDERER_CFG_PATH /etc/hyperledger/fabric
+ENV CORE_PEER_MSPCONFIGPATH $PEER_CFG_PATH/msp/sampleconfig
+ENV ORDERER_GENERAL_LOCALMSPDIR $ORDERER_CFG_PATH/msp/sampleconfig
 
 # create needed directories
 RUN mkdir -p \

orderer/orderer.yaml

@@ -55,7 +55,7 @@ General:
     # LocalMSPDir is where to find the crypto material needed for signing in the orderer
     # It is set relative here as a default for dev environments but should be changed to the
     # real location in production
-    LocalMSPDir: ../msp/
+    LocalMSPDir: msp/sampleconfig
 
     # LocalMSPID is the identity to register the local MSP material with the MSP manager
     # ----!!!!IMPORTANT!!!-!!!IMPORTANT!!!-!!!IMPORTANT!!!!----