Remove duplicate isAdmin check.
Call the modifyDevice callback if it's available.
Add Horde_ActiveSync_Device::MULTIPLEX constants.
ws
Merge branch 'master' into kronolith_4_2