Merge in CASA/casa6 from CAS-13848 to master
* commit '36668637105e22292642e2feff569d373ccc90b3':
Fixed typo in tearDown method that prevented the removal of data
Commenting out the call to tb.showcache()
Fixed deprecation warning coming from assertEquals