Improved Shared Diagonals strategy

The shared diagonals strategy now accounts for horizontally adjacent
spaces, when there is one more ship to be placed. This situation was
first handled by boats_solver_attempt_water_rows, but it should be
available on the Tricky difficulty level as well.