CLOUDSTACK-5423: Fixed 5423