Merge pull request #86 from painless-security/jennifer/aaa_server_port