Revert "CLOUDSTACK-5674: Few new fixes"

This reverts commit 3493f17bad3b8b57778b62d464c5e7f910351cc0.