merge ae1e3691f5cf and 654543bb2b36 from bitcoinj head
remove separate TODO file, use in-code todo comments