Fix a timing sensive cloudwatch testcase

This was leaving a watchrule in the db and causing
a test case in test_engine_service.py to fail.
Also cleanup the created stacks.

Change-Id: If8451291b4f17c797b72fd3ab51793d51c2c97ad