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

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

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

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.

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

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)

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

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.

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.

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

Denote Openfire 4.0.0 Release

OF-454 Reflect presence to originator

Only use SSLv2Hello for client-mode

OF-1004: Apply i18n to admin console

Fix some javadoc warnings

OF-821: Count occupants by nickname

OF-1034 Check for existing sessions properly

Returns the count of nicknames rather than the number of connections
(full JIDs), which will now also match the list of occupants.

solve the memory leak problems which is caused by add LocalMUCRoom ob…

OF-821: Prevent duplicates for MUC item query

Drop unnecessary null check.

Corrects issue with multiple JIDs sharing a nickname (masquerading)

Replaced the 'set this var with this translation' definition for
a functional equivalent but easier-on-the-eyes definition.