Revert "CLOUDSTACK-5674: Few fixes"

This reverts commit e6b93b0a6824a3f2845fb42596c04b348ae147e2.
CLOUDSTACk-5674: Added few misc changes to make it work.
CLOUDSTACk-5674: Added fix for CLOUDSTACK-5674
CLOUDSTACK-6082: Add alternate zone creation under deploy DC
CLOUDSTACK-5674: Add missing test_data.py