Merge pull request #1326 from andytaylor/master

https://bugzilla.redhat.com/show_bug.cgi?id=1013536  - fixing tests
https://bugzilla.redhat.com/show_bug.cgi?id=1017559 / https://issues.jboss.org/browse/HORNETQ-1264 - fixing message copy isolation
Merge pull request #1328 from clebertsuconic/master

https://bugzilla.redhat.com/show_bug.cgi?id=1017559 / https://issues.jboss.org/browse/HORNETQ-1264 - fixing message copy isolation
retry creating server lock file on io failure