Set module directory correctly when following module.link files
corrected error message with correct file name
Merge branch 'lost_changes'
upgrade to hazelcast 2.6.7
Shutdown cluster manager before exit otherwise hazelcast non-daemon threads will prevent exit
Merge branch 'master' into sharedmap_polymorphic
Cleanup imports for files