CLOUDSTACK-5976: Typo in "ssh_keypairs" table's foreign key constraints
on the Upgraded Setup
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade302to40.java
CLOUDSTACK-6472 (4.3 specific) listUsageRecords: Pull information from removed items as well, fixing NPEs/Null UUIDs with usage API calls.

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
Revert "CLOUDSTACK-6485: private gateway network should not be associated with vpc"

This reverts commit c37df38c834a7cfc075228c697fc6d358a70f574.