MYFACES-3425 [perf] enhance code applying best practices (add Scope.NONE to prevent remove from hashmap on evaluation and then create Map.Entry instance over and over)