Merge remote-tracking branch 'cohuck/tags/s390x-3270-20170504' into staging