Merge pull request #1581 from jbertram/master

fix apostrophes which can break logging messages
Integration tests run from IDEA don't log properly; they also complain when run from the command line about not being able to find the logging.properties