CLOUDSTACK-6250: updated review comments, added unit test case