Minor change to METAL slot handling.  Convert unfilled 'define-slot' to neutral 'slot' instead of active 'fill-slot' on expansion.

Also change to use time.localtime() instead of calling time.time()
first.  This is a Python 2.1-ism.

Per request by Andreas Jung.

stop using 'nobody', warn of insecure umasks.

Also remove conflict cruft that snuck into CHANGES.txt.

      - WebDAV: removing an non-existing property now returns a HTTP
        200-OK response instead of 404 (now compliant with RFC 2518)

  - Removed spurious 'self' argument from scarecrow interfaces;  suppressed
    'self' in interface methods created from actual method objects.

        TextIndex to index numbers, single characters. It is also
        possible to enable case-sensitive indexing. The new
        configuration options are available through the addForm
        of the Vocabulary object.

  1. Fixes a bug in the TM whereby tpc_abort was ignored. this
     was the likely cause of external transaction manager's never
     recieving a commit or abort statement and hanging because
     they could never register again for a transaction.

  2. Works around a bug in Zope's transaction machinery. This
     bug is a corner case. it would cause loss of data integrity
     if a external transaction manager were involved in a
     zope transaction that involved a subtransaction commit, in
     which the overall transaction was aborted.

merged toby-permission-table-headers-branch: Collector 274: nicer formatting for tall permissions table