cherry-pick to 4.3

[Alena Prokharchyk]

Animesh, can you please cherry-pick the commit below from 4.3-forward to 43?
444e8f6bb3447a7eeb97f7c5d9b46abba3150072

Bug id is https://issues.apache.org/jira/browse/CLOUDSTACK-6198