SLE12 support (bnc#900660)

- includes some more bug fixes which I found during testing
`contentmap.values.each(&:strip!)`