Simplify code in Web::Interface{Agent,Customer}

No functional changes
Merge branch 'web-interface-simplify-condition' of https://github.com/moritz/otrs
Merge remote-tracking branch 'upstream/master' into otrs-master