NOJIRA:  The hsql driver jar from the BookmarksPortlet overlay was not being properly excluded (oddly);  tweaking the config slightly to make it work
UP-3663 Add support for import of archive files

    MediaType and resolution and archive processing

    Resolves the media type of the imported file and then wraps it in the correct
    archive/compress input stream handler.
UP-3673 Add logging config for calendar portlet
UP-3660 Allow editing of all attributes

Person Directory may not know about all possible attributes, allow
editing of any user attribute
Merge branch 'master' of github.com:Jasig/uPortal