[6.15.z] fixes in api role helper functions

[6.15.z] fixes in api role helper functions #4613