[6.12.z] fixes in api role helper functions

[6.12.z] fixes in api role helper functions #5999