Last fixes for ITK4
Merge branch 'port-to-slicer-4.2' into itk4