[boost] [git][multi_index] help merging from develop