Fix broken pep8 from 1305697eaa598a3bc59d5b81f5f838369c6d5b8e

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK-3744 Fixed order of cleanup objects, removed offerings cleanup

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
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>