Fix for CLOUDSTACK-5864

Fixed the mentioned issue.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Merge branch '4.3' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.3