Branch HEAD

b=14413;          14763
r=shadow, johann; bwzhou

fix leak-finder and add a test for conf-sanity.sh (including andreas's patch
to suppress the false negative of test 39)