Daan, Could you cherry-pick the commit 1f7167555d92bc2d5eb964e6de88a052db1388a7 to 4.4 branch?
This commit is to fix the bug CLOUDSTACK-6816 . https://issues.apache.org/jira/browse/CLOUDSTACK-6816 http://apache.markmail.org/message/xtk2tcpc4nscukhn Thanks, Noji
