Minor improvements for Server and  Confluence Data Center compatibility

Fixed in this release