Fix EntityManager leak in ThreadLocal after failed transaction#1917

SantanuKar43 wants to merge 2 commits intogoogle:mastergoogle/guice:masterfrom

SantanuKar43:bugfix/stale-entitymanager-cleanupSantanuKar43/guice:bugfix/stale-entitymanager-cleanupCopy head branch name to clipboard