libtremor: merge upstream revision 17539 and 17540 'Additional codebook validity...