sync bootloader's cleanups with master
Merge pull request #158 from coolo/sle12_sync_bootloader

sync bootloader's cleanups with master