Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I0998d7a73865c7d68bf56c8b1aea5e8c5b1ec081
Merge topic 'composite-data-display-attributes' into next

db1633e Add composite data display attributes support
Merge topic 'fix-composite-painter-with-multi-piece' into next

d1003be Forward VTK to bring in 'fix-composite-painter-with-multi-piece'
Updating VTK to origin/master.

Since VTK has brought in several dashboards fixes, we update it.

Change-Id: I0495a1a54bc61d4a3412957743583674e8e2ecaf
Merge topic 'update_vtk_master' into next

c549031 Updating VTK to origin/master.