remove then keyword from if clauses
escape user/pass in es output plugin