Cherry-pick 7f6b3c08db5f from 4.4 master to fix CLOUDSTACK-5998 in our 4.2.1 mirror