CLOUDSTACK-6967 merge problem resolution