Updating code so that it will find the right path for sql query .sql files during test execution.
Merging in changes.

Merge branch 'master' of https://github.com/lcaballero/snb-1