Merging in latest from upstream (ZP/z-push:refs/heads/develop)

* commit '6c326890':
  ZP-844 Delete from and until properties when out of office is not time based.
  ZP-860 Show Z-Push version in autodiscover.

src/autodiscover/autodiscover.php

@@ -60,6 +60,7 @@ class ZPushAutodiscover {
      */
     public static function DoZPushAutodiscover() {
         ZLog::Write(LOGLEVEL_DEBUG, '-------- Start ZPushAutodiscover');
+        ZLog::Write(LOGLEVEL_INFO, sprintf("Z-Push version='%s'", @constant('ZPUSH_VERSION')));
         // TODO use filterevilinput?
         if (stripos($_SERVER["REQUEST_METHOD"], "GET") !== false) {
             ZLog::Write(LOGLEVEL_WARN, "GET request for autodiscover. Exiting.");

src/backend/zarafa/zarafa.php

@@ -1642,6 +1642,9 @@ class BackendZarafa implements IBackend, ISearchProvider {
                     $oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
                 }
             }
+            else {
+                $deleteProps = array(PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL);
+            }
         }
         elseif($oof->oofstate == SYNC_SETTINGSOOF_DISABLED) {
             $props[PR_EC_OUTOFOFFICE] = false;