Revert "CLOUDSTACK-4393 typo fixed"

This reverts commit b9f029857bdf709bb3b3b50d75b028b0760dc598.
CLOUDSTACK-4394: remove cleanups for offerings

offerings do not need to be cleaned up

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit b9c2471cfc5e051db4478783c6928f6e0c5a1f7a)
CLOUDSTACK-4225: Fix template references in setUpClass

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