Merge "Update jjb for Alpine 3.13"