Bring back cloud-watch child module that got lost during the merge
Fix bug introduced during merge
Change AWS SDK version to OSGi compatible one
Remove unused file; I don't know where this came from
Hack to find out what's killing the thread