CXF-6146 (reverted from commit bd737de50dbd86ae4c862a4dcf6bdfe4ce0accae)
CXF-6145 (reverted from commit 4c4d668ec1fbfbaf14135be8cef42497fda9d347)
CXF-6146 (reverted from commit bd737de50dbd86ae4c862a4dcf6bdfe4ce0accae) (reverted from commit ebcf0671124a767d5295226ffc47f5c8d150906a)
CXF-6146 (reverted from commit bd737de50dbd86ae4c862a4dcf6bdfe4ce0accae) (reverted from commit ebcf0671124a767d5295226ffc47f5c8d150906a) (reverted from commit 7811b8a6db24038e59dcbbbd382bfe675b97b38a)