ICU-10992 merge from trunk, fix memory leak

X-SVN-Rev: 36540
2 files changed