[CXF-5311] Minor update to the grant handler