Refactor of zk_concurrency into state/module pair.
Re-order some args
Add lock_holders function to see who holds the locks
Pylint fixes
Merge pull request #17023 from jacksontj/develop

 	Refactor of zk_concurrency into state/module pair.