Adding bugfix for support for Zimbra 8.6.