Merge topic 'hasopaque-logic-fix'

aefc34f5 vtkActor: rename local variable for clarity
edab87e4 vtkCompositePolyDataMapper: restore HasOpaqueGeometry return value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Jaswant Panchumarti (Kitware) <jaswant.panchumarti@kitware.com>
Merge-request: !11776