Merge pull request #39 from rafaelweingartner/CLOUDSTACK-9483

Solve #CLOUDSTACK-9483