Updating some items in the listener and other random things... commit-for-merge
Merge branch 'stm-refactoro' of github.com:lbrackspace/atlas-lb into stm-refactoro
merging for commit
Merge branch 'stm-refactoro' of github.com:lbrackspace/atlas-lb into stm-refactoro