[858813] make sure the previous fix is applied to all applicable component classes

Cherry-Pick master d36271e39a3003d22325e226f03dda0952408918
Signed-off-by: Jay Shaughnessy <jshaughn@redhat.com>