Minor Bug Fixes and cleanup

Fixed a bug when parsing ACL rules.
Cleaned up some code in IpAddressImplement.
Extended wait time for deploying VMs.
Added endpoints to map

Added missing endpoints to collection. Will be used to allow multiple
endpoints to be used under the same account.