Fix for the second part of #2285
Merge branch 'v1.12.x' into next
Merged #2403 strip-protfile fix

Escaped special characters in regexes
changes in makefile for #2404
Merging into next: larkost/1402-make-reql-tests-friendly
Review 1486

The biggest change here is a move away from using the makefile to run the rql tests. Instead the test-runner command now should be run directly.
Merge branch 'next' into sam_2353
Merge branch 'sam_2353' into sam_2353_ii