Reverted danny's changes; class seems to be broken
Reverted the mapcastest
Reverted MapLockTest
Fixed executor test and some more cleanup
cleanup
Merge pull request #155 from Danny-Hazelcast/testFix

cleanup
using basename
Merge pull request #156 from Danny-Hazelcast/testFix

using basename
Fixed bug with parallel tests
Resolved merge conflicts
Fixed bug with not waiting for stop to complete
Merge branch 'OriginMaster' into mapListernersStressTest