removed collection of handlers, separate client and instance handlers
added check to default handler
minor improvement
Merge pull request #1956 from gurbuzali/client-oom-handler-fix/3.2-RC3

removed collection of handlers, separate client and instance handlers