Fixes #3847: lineinfile without regex
Fix merge conflict
Merge pull request #4660 from kolbyjack/lineinfile_no_regexp