MLHR-939 #resolve
Merge pull request #824 from andyperlitch/restartGateway.MLHR-939

MLHR-939 #resolve