Merge topic 'update-vtk-20140820'

1e5963ac vtk: update for OS X mpi4py fix
Merge topic '14911_fix_ICC_build'

6108bb3b Fix build issue with ICC.
Merge topic 'catalyst-script-plugin-client'

f17249da CatalystScriptGenerator: required on the client only
Merge topic 'fix-qhp-warnings'

f97ca49a qhp: set CMP0053 to NEW
3996c328 qhp: revert qhp changes; external projects need the file
31f183d6 qhp: unescape quotes
ec0ee954 qthelp: avoid CMP0053 warnings with @ variables
Merge topic 'import-pygments'

b1e29b12 pygments: add vtk module information
20adf387 redtabhtml: add a formatter which highlights tabulators
6ff9a9eb pygments: remove files unnecessary for ParaView
74d542ab Merge branch 'pygments-upstream' into import-pygments
488bcb2a pygments: 1.6-13834ec94d2c5a90a68bc2c2a327abd962c486bc (reduced)
Merge topic 'pvw-fix-xdmf-reader-name'

8e04312c Update Xdmf3Reader proxy name for pvw
Merge topic 'update_baselines'

6cd6fe7a Add warning exclusions.
7772c0cc Update warning exclusions.
c62b4839 Add baselines for Kamino.
3357b709 Add baselines for neodymius.
d21c2b48 Increase LoadStateMultiView image diff threshold.
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I91e0864339f9eecbb45151ee5c7ce004c22148c8