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
BUG #14962: Fixed issue with glyph panel.

Fixed the duplicate reset buttons. Also refactored the code to be a
little cleaners, with less duplication.

Change-Id: I6d6f360eaa0ad28a5d66ef2f2573774ca8b2384b
Merge topic '14962_fix_glyph_panel' into next

f7e149e6 BUG #14962: Fixed issue with glyph panel.
osx: install all python files, not just directories

Change-Id: I18f4c78a340676f6714690c41b684be3acf59f04
Merge topic 'python-osx-install' into next

9643e203 osx: install all python files, not just directories
Fix SurfaceLICTestDriver on static builds.

We do need to load plugins in static builds now too. This fixes windows
static build, surface lic tests.

Change-Id: Idf67e89fbb85c23587dcdb188e3b1518707074b3
Merge topic 'dashboard_fixes' into next

5f994d30 Fix SurfaceLICTestDriver on static builds.
Fixed unused variable warning.

Change-Id: If5954fb65359875ffe87f4a2b9676558f3253ba5
Merge topic 'dashboard_fixes' into next

f0dd5f2f Fixed unused variable warning.