CLOUDSTACK-2474: Remove garbage code which was added while resolving merge conflicts.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK-2473: Fix a typo in test_vpc_network.py

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK-2472: Fix unresolved reference to max_value

Signed-off-by: Prasanna Santhanam <tsp@apache.org>