Redmine#4096: fix mergedata() leaks
Redmine#4096: update Valgrind suppressions for CheckOpts