more conservative locking to prevent router hangs#1978

garypen wants to merge 1 commit intodevapollographql/router:devfrom

garypen/fix-router-hangapollographql/router:garypen/fix-router-hangCopy head branch name to clipboard