Indel cleanup fastforward

Fastforward to current ToT for indel-realigner-cleanup topic branch.