clean up the code from dead code in comments, indentation and method access
consistently apply the timeouts
consistently check the state machine and whether the messages arriving are
indeed targeted at us. This fixed NPEs when somebody else on the network
is doing a firmware upgrade.
Coverage increased (+0.2%) to 71.132% when pulling 9e7c54193d15ec035a5d984c5b7fde2d962f634a on bracz-loaderclient-fixup into ff7a78f4296e3e7eba8a825f10af9c6a9d8b4f57 on master.