el7.x: various changes (see commit list)

Mostly sl6.x fixes/changes ported to el7.x.