Land latest changes to v2019-updates

Keep in sync u-boot across the different branches.
All versions needs to be able to enable/disable bootcount.