Revert "CLOUDSTACK-1744: It's due to db upgrade issue. On master,
deploydb will upgrade db to 4.2, which will update vm_template's
image_data_store_id, while deploydb-simulator adds a new column in
vm_template table, which doesn't set image_data_store_id, thus causing
NPE."
This reverts commit 33937c980eaae5f2e8dbb5b21f59bdb1a89a70be.
Conflicts:
setup/db/templates.simulator.sql
Signed-off-by: Prasanna Santhanam <tsp@apache.org>