CLOUDSTACK-1562: Replace @DB support to be the formal implementation instead of a temporary hacking one