Remove duplicate and inconsistent condition from water_lines_casing

This resolves #939
Merge branch 'water-lines-casing-sql-bug' of https://github.com/math1985/openstreetmap-carto into math1985-water-lines-casing-sql-bug
Merge branch 'math1985-water-lines-casing-sql-bug'