fix comparison
change to work with dovecot 2.2 (changed objects beetween 2.0 and 2.2)
Merge branches 'certificate' and 'master' into certificate
Merge branches 'certificate' and 'master'