2.1 no bin compat repeat

Cherry picked against 2.1-no-bin-compat

https://github.com/slick/slick/pull/932