Bump to yangtools-2.1.6 and triemap-1.0.4