Only ignore existing matches if preserve_all_lines is used

That option is documented to disable convergence, while preserve_block
should respect existing occurances of the promiser within the selected
region.

Redmine #1525
Merge pull request #1858 from vohi/redmine/1525

Only ignore existing matches if preserve_all_lines is used