Fixed issues related to port and added test cases
Merge pull request #56 from opscode/adamed-oc-8242-azure-fixes

OC-8242: Fixed issues related to port and added test cases