On today's design forum we talked about improving the Patient Merge functionality in Platform 2.1. (Particularly we should allow modules to plug in pre- and post-merge actions, and we should separate checking records to see if they can be merged from doing the actual merge.) There is a Bahmni implementation team that will create a ticket for this at some point (@karrtikiyer).
Bahmni will want to make some improvements to the domain model, including introducing Condition Lists, but we're not yet sure if these should happen in a module first, or if we're ready to put them in openmrs-core. I'll have more to say on this front in 3 weeks after I'm back from an India trip.