bug:none
  -- Integration from HELIX to MAIN
bug:none
 -- Integration from HELIX to MAIN
bug: 57717 Auto update ZCS BUILD to 3552

http://bugzilla.zimbra.com/show_bug.cgi?id=57717
Integrate change 295206 from ZDESKTOP-701
       bug: 58774
       Make extensionVersion 2.0.1; 3.0.1 still didn't work correctly on 
       Win 7.

http://bugzilla.zimbra.com/show_bug.cgi?id=58774
bug: 57717 Auto update ZCS BUILD to 3553

http://bugzilla.zimbra.com/show_bug.cgi?id=57717
Integrated the following from //depot/zimbra/GNR/...:
Change 295301 by quanah@qgnr on 2011/04/18 12:58:48

bug: 58617
GNR 6.0.12 P2

http://bugzilla.zimbra.com/show_bug.cgi?id=58617
Integrate Change 295318 by rhoades@MATTXPDEV on 2011/04/18 13:36:16

Bug: none

Selenium Harness: move proxy.pac to conf
bug: 59101
If JYTHONPATH is not set, set it.  Affects being run via cron

http://bugzilla.zimbra.com/show_bug.cgi?id=59101
bug: 57430

proxy ChangePasswordRequest to the home server.

https://reviewboard.eng.vmware.com/r/226127

http://bugzilla.zimbra.com/show_bug.cgi?id=57430
Integrate Change 295279 by jhidayat@ZimbraQA_jhidayat on 4/18/2011 11:52:01 AM
Bug: None
Cleaning up the old ZDesktop selenium project files.
bug:58024
explicitly setting command handler of application/xml, text/xml and text/plain.
A customer reported problems with non ansi characters after the JVM command switches fix. 
Setting the default command handler explicitly makes sure that the correct handler are used even if some other library registers different handlers later on.

http://bugzilla.zimbra.com/show_bug.cgi?id=58024
Integrate Change 295347 by rhoades@MATTXPDEV on 2011/04/18 14:20:52

Bug: none

Selenium Harness: admin console alias tests.  Move common method logic into the test cases.
bug: 58865 add InstallUpdates icon integrate HELIX->main

http://bugzilla.zimbra.com/show_bug.cgi?id=58865
bug:58328 Refactor DbSearchConstraints

http://bugzilla.zimbra.com/show_bug.cgi?id=58328
Integrate change 295380 from HELIX to main

-------------
Bug: 58913 - Autocomplete search result matching non-displayed fields disappears after typing another letter
Don't do substring matching against cached autocomplete results in the client, since the server matches
against fields it might not return in the results.

http://bugzilla.zimbra.com/show_bug.cgi?id=58913
bug: 57717 Auto update ZCS BUILD to 3554

http://bugzilla.zimbra.com/show_bug.cgi?id=57717
bug: 59109

Synchronize on mailbox.

http://bugzilla.zimbra.com/show_bug.cgi?id=59109
bug:58328 Fix AssertionError for NULL sender

http://bugzilla.zimbra.com/show_bug.cgi?id=58328
Integrate Change 295426 by jhidayat@ZimbraQA_jhidayat on 4/18/2011 5:24:54 PM
Bug: None
Clean up the left-over Desktop old files.
bug: 57717 Auto update ZCS BUILD to 3555

http://bugzilla.zimbra.com/show_bug.cgi?id=57717