Merge 0.11->trunk

net.server_epoll: Add a hard deadline on shutdown to extra-fix #1670 Should ensure shutdown even if sockets somehow take a very long to get closed.

net.server_epoll: Close sockets added after shutdown signal (fixes #1670) This should ensure that sockets get closed even if they are added after the quit signal. Otherwise they may keep the server alive.

prosodyctl: Fix later import of LuaFileSystem lfs or WHAT How did this even happen?

mod_bosh: Fix typo in comment

mod_register_limits: Reword some options Remember to remove the compatibility things in some future version

MUC: Reject full JID in affiliation queries XEP-0045 states: > Affiliations are granted, revoked, and maintained based on the user's > bare JID, not the nick as with roles. Therefore inclusion of a full JID in affiliation queries is invalid. Thanks to Ge0rG and Poezio for discovering this issue.

net.server_epoll: Fix indentation messed up in last merge Seems to have happened in 6427e2642976, probably because of Meld

net.server_epoll: Don't immediately destroy upon getting closed on read Instead try to write any remaining buffered data. If the write attempt also fails with "closed" then there's nothing we can do and the socket is gone. This reverts what appears to be a mistakenly included part of c8aa66595072 Thanks jonas’ for noticing

mod_pubsub: Advertise support for 'max' as value for max_items Ref #1643