ISSUE=8687 fixed issues with reload config

Fixed several issues with reload config, it started with concurrent
modification stack traces and moved to a few logic problems.  I believe
I have squashed them all at this point.
Merge branch 'ISSUE=8687-concurrent-modification-and-failure-to-reload-config' into 1.0.2-dev
Merge branch '1.0.2-dev' of https://github.com/ajragusa/FlowSpaceFirewall into 1.0.2-dev