Merge pull request #1593 from jbertram/master

HORNETQ - Allow clients to specify timeout value for journal lock acquisition
restore forwards compatibility so that newer clients can talk to older servers