JCLOUDS-584: HP Cloud Object Storage Fixes for 13.5

https://issues.apache.org/jira/browse/JCLOUDS-584
Backport to 1.7.x
Addressed this and some other instances in 8fa209b15ec91829be3810dabc9b423296b58400.