pep8 fix

Change-Id: I4a78c1259219bbcdb6ff6c75a27c8852b9d25edf
enable sensible and configurable bootloader and kernel load timeouts

Change-Id: Ie7279c64d595c9e4075a7f3ed2e1f445343c734c
Merge branch 'master' into staging