[MSHARED-373] Upgrade Maven baseline to 2.2.1 - Added missing generics - Worked out some TODOs - Used some 2.1.1 methods