0f5fcd7
Update to build21 and fix related issues Signed-off-by: Andy Mender <andymenderunix@gmail.com>