have a stab at fixing RHEL-5 build that hasn't got new atk roles

Change-Id: Idbfc9bae9593416564783974ef7237e20e6400b0
fix ambiguities

Change-Id: I27c8ef11a0eedbcaf29865dff83841675b775171