Two related fixes for s390 Add / Edit device actions.

See bnc#747844 - incorrect defaults when editing devices.

The patch also contains refactoring of dialog sequence for s390 specific control flow. It affects bnc#476490.