Merge branch 'fix_vtkdata_dependent_testing-rel' into release

Change-Id: I293912a70f94cb50f045bf32a97d5219c3e644c3
Merge branch 'release'

Change-Id: I46d7f0121d75c575f95e6d37367eda73743e921c