Fix broken pep8 from 1305697eaa598a3bc59d5b81f5f838369c6d5b8e

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 8545e6461880dae08a8b3f7d07d9302807982c29)
CLOUDSTACK-3744 Fixed order of cleanup objects, removed offerings cleanup

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 08c82883f6bcc18804c88633c9c85764c5d22417)
CLOUDSTACK-3900: Remove the offering that is deleted before cleanup

One of the VPC offerings (4) is deleted in the test before moving into
teardown. This offering should be removed from cleanup.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit d66edb5e2bc7d0396709ffcc35dfc61d563f307a)