Conflicts:
	src/java/org/jivesoftware/openfire/keystore/IdentityStore.java

IdentityStore.addSelfSignedDomainCertificate considers the certificate
validity in days, not in months.

OF-1049: Fixes for certificate management

Remove exclamation mark from Search button (OF-1055)

OF-1053: Don't use apostrophe in i18n

OF-1046: Improve offline-storage usage

Existing code already tried to prevent message bounces when a stanza was
sent by the server itself. This commit builds on that solution.
Also, debug logging was added for the store-and-* strategies when storage
was no longer possible as a result of quota limitations (we had a hard time
debugging this)

Replaced all apostrophes with HTML-encoded entities to prevent
formatting problems.

REST API Plugin update to version 1.2.2

A fix for OF-1041

By reversing the order in which objects are added to the internal state,
a failure during store construction won't put the manager in a half-initialized
state.

Check if the keys in the identity store can be accessed when the identity store is
being created.

Don't initialize the admin console TLS connector when no identity store
is available (that's guaranteed to fail).
Don't log admin console startup success when there's an error.

The admin console should existing-but-invalid configuration.
Configuration should be modifiable through admin console.

Should not store chat state messages, which contain a thread element.

OF-1037: Split Bookmarks from ClientControl.

The problem was, that the logic stored empty chat messages, which contained a thread and chat state. The loop first checked the namespace of the thread, which was empty and therefore thought it should store it.

Made a search by distinguishedName Active Directory specific
as it is difficult to come up with a generic solution.

OF-1042: Don't NPE when a session is already closed when </stream>

Update plugin min Openfire version requirement to 4.0.0

Fixes for banning problems in MUC rooms

After banning, the user is not kicked from the room. The user is added
to the ban list so they can't re-join the room or post messages, but
they are not kicked out of the room so the user can still receive messages
sent to the room.

The problem is an additional check for isMembersOnly() was only allowing users
to be kicked from members only chat rooms. Whenever a user is marked as an
outcast they should be kicked from the room regardless of if the room is a
members only room or not.

Looks like this problem was introduced in commit
822abb01

Based on the MUC spec it should be sending "outcast" on banning.

Looks like this was introduced in commit 822abb01

Previously, we had a quasi-hack of `3.11.0-alpha` as the min requirement
on these, but this release never happened.  This update moves all these
plugins to 4.0.0, which hopefully provokes less confusion.

Denote Openfire 4.0.0 Release

OF-454 Reflect presence to originator