bugfix/CLOUDSTACK-7476 for 4.4 branch.

See https://github.com/apache/cloudstack/pull/15 for the pull request
that was merged to master & associated discussion.