Simplify maildrop path handling. Regardless of the order of options path is now correctly handled.
pull in latest master.