Merge pull request #55 from ggear/master

Resolve firewall port to role mappings after role refactoring