Fixed CLOUDSTACK-6756: usage id is not being returned for an ip in deleted ip range

(cherry picked from commit a6ed48fc9c5f68b46f0d2e05adefc7263c4cd0d0)

Conflicts:
	setup/db/db/schema-430to440.sql