Merge pull request #1049 from ispringer/master

minor: grammar fixes to log messages
test fix: added latches to tests with entry listener
test fix: getting instance from test factory
Merge remote-tracking branch 'upstream/master'