Update themeset test plan to match latest UI.
Merge branch 'master' of github.com:maqetta/maqetta
Comment out all the LDAP props.

Was preventing server startup.
Fix another small bug in Manage States dialog. Update test case for
States palette.
Merge branch 'master' of github.com:maqetta/maqetta
Fix javax.servlet import version.

To match that of javax.servlet.http.
Import javax.servlet as a library, not plugin.
Merge branch 'master' into orion-war

* master:
  Import javax.servlet as a library, not plugin.
  Fix javax.servlet import version.
  Fix another small bug in Manage States dialog. Update test case for States palette.
  Comment out all the LDAP props.
  Update themeset test plan to match latest UI.