Merge pull request #73 from mchf/Code-11-SP3

Small refactoring in s390 related code and fix for bnc813835