Merged changes from Stefan Knorr (astron) <heinzlesspam at gmail dot com>,
Bjoern Michaelsen <bjoern dot michaelsen at canonical dot com>, and
Petr Mladek <pmladek at suse dot cz>

Change-Id: I942f747aadc897b73d97b2047e267d752580aa33
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>