Overcome bug CLOUDSTACK-2758

Signed-off-by: Prasanna Santhanam <tsp@apache.org>