Revert "Revert "Merge branch 'master' of"", Reverting msmemon's merge commits and revert commit of that merge commit

This reverts commit 5a1b225fd4cb0e40953f63e5a0d100a55160d9c3.
Added missing thrift generated classes , this will fix the build issue