Fixes: #1895 remove the sieve dir from the cyrus plugin
Fixes: #1896 remove the contrib dir from the uw-imap plugin