Fix build error due to CR 6801
Fix build error due to CR 6801

https://gerrit.hyperledger.org/r/#/c/6801 intro an import
that has been moved to a different location.

Change-Id: I1c62529c0ebd011d7515b9111420ffb30d3daf1e
Signed-off-by: Binh Q. Nguyen <f9973a500994e06a1c41d0661d4a8df150b6e067@us.ibm.com>

ibmmark/fabric,mffrench/fabric,blockc/fabric,kchristidis/fabric,manish-sethi/fabric-sidedb,mqshen/fabric,magg/fabric,ckeyer/fabric,cophey/fabric,ckeyer/fabric,mffrench/fabric,blockc/fabric,xixuejia/fabric,kchristidis/fabric,binhn/fabric,rameshthoomu/fabric,rameshthoomu/fabric,thakkarparth007/fabric,binhn/fabric,ckeyer/fabric,bmos299/fabric,king3000/fabric,jimthematrix/fabric,Ryan--Yang/fabric,blockc/fabric,Ryan--Yang/fabric,king3000/fabric,tkuhrt/fabric,rameshthoomu/fabric,phariel/fabric,king3000/fabric,cophey/fabric,bmos299/fabric,Ryan--Yang/fabric,phariel/fabric,tkuhrt/fabric,mffrench/fabric,blockc/fabric,magg/fabric,tkuhrt/fabric,lukehuangch/fabric,Ryan--Yang/fabric,magg/fabric,magg/fabric,mqshen/fabric,lukehuangch/fabric,magg/fabric,muralisrini/fabric,blockc/fabric,kchristidis/fabric,chrisguoado/fabric,mffrench/fabric,jimthematrix/fabric,lukehuangch/fabric,muralisrini/fabric,mffrench/fabric,phariel/fabric,thakkarparth007/fabric,bmos299/fabric,ibmmark/fabric,mqshen/fabric,rameshthoomu/fabric,lukehuangch/fabric,magg/fabric,bmos299/fabric,blockc/fabric,hyperledger/fabric,king3000/fabric,ckeyer/fabric,manish-sethi/fabric-sidedb,phariel/fabric,cophey/fabric,thakkarparth007/fabric,manish-sethi/fabric-sidedb,rameshthoomu/fabric,bmos299/fabric,kchristidis/fabric,manish-sethi/fabric-sidedb,binhn/fabric,thakkarparth007/fabric,mqshen/fabric,mffrench/fabric,ckeyer/fabric,cophey/fabric,rameshthoomu/fabric,ckeyer/fabric,magg/fabric,ibmmark/fabric,manish-sethi/fabric-sidedb,cophey/fabric,stemlending/fabric,rameshthoomu/fabric,phariel/fabric,manish-sethi/fabric,chrisguoado/fabric,cophey/fabric,chrisguoado/fabric,lukehuangch/fabric,tkuhrt/fabric,stemlending/fabric,phariel/fabric,cophey/fabric,kchristidis/fabric,manish-sethi/fabric,ibmmark/fabric,tkuhrt/fabric,mqshen/fabric,chrisguoado/fabric,thakkarparth007/fabric,king3000/fabric,tkuhrt/fabric,stemlending/fabric,ckeyer/fabric,Ryan--Yang/fabric,thakkarparth007/fabric,lukehuangch/fabric,xixuejia/fabric,muralisrini/fabric,phariel/fabric,chrisguoado/fabric,king3000/fabric,chrisguoado/fabric,bmos299/fabric,tkuhrt/fabric,Ryan--Yang/fabric,xixuejia/fabric,king3000/fabric,manish-sethi/fabric-sidedb,manish-sethi/fabric-sidedb,mffrench/fabric,lukehuangch/fabric,mqshen/fabric,bmos299/fabric,ibmmark/fabric,chrisguoado/fabric,kchristidis/fabric,kchristidis/fabric,Ryan--Yang/fabric,hyperledger/fabric,ibmmark/fabric,blockc/fabric,thakkarparth007/fabric,ibmmark/fabric,mqshen/fabric,stemlending/fabric