Request inclusion in 0.12 https://issues.apache.org/jira/browse/PROTON-1122

[Alan Conway]

https://issues.apache.org/jira/browse/PROTON-1122 minor fixes to issues
discovered by coverity, one is serious.