One more place this can be fixed.
Fix fatal crash on sending back incoming sync conflict status. Bug #12755

Two PHP error message get fixed:
PHP Fatal error:  Undefined class constant 'SYNC_CHANGE' in /usr/share/pear/Horde/ActiveSync/Request/Sync.php on line 516
PHP Fatal error:  Call to a member function content() on a non-object in /usr/share/pear/Horde/ActiveSync/Request/Sync.php on line 518

Signed-off-by: Michael J Rubinsky <mrubinsk@horde.org>
BFN
Fix errors when the filter api is unavailable.

Bug: 12757
We might have ONLY failures too.
Try to work around issue on android with conflicts:

Ensure that any conflicts that result in server data overwritting
client data, have the server data send as a MODIFY element in
the same response as the conflict status code for the same message.
Don't assume mail API is available.

Bug: 12738
[mms] Explicitly reject XOAUTH2 as a authentication mechanism if it is not configured in the client (Bug #12756).
Released Horde_Imap_Client-2.15.5
Development mode for Horde_Imap_Client-2.15.6
Fix global js var
Merge branch 'master' into imp_6_2