merged conflicts
Merge branch 'stm-refactoro' of github.com:lbrackspace/atlas-lb into stm-refactoro
Merge branch 'stm-refactoro' of github.com:lbrackspace/atlas-lb into stm-refactoro
Merge branch 'stm-refactoro' of github.com:lbrackspace/atlas-lb into stm-refactoro