Merge fixes from SLE11 to master (for SLE12) (see bnc#831875)