Fixes for ZEN-10088 - Exchange 2010 / 2013 support