CLOUDSTACK-6316: Fixed component and smoke test failures-third pass