CFY-927 fix bug and add tests
Merge pull request #93 from cloudify-cosmo/feature/CFY-927-port-bugfix

Bug fix in port override of cloudify_agent configuration