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.
Merge branch 'hotfix/4.4-7476' of https://github.com/schubergphilis/cloudstack into 4.4