* fix a couple of remaining issues with previous commit,
* merge ei_product_blocking_traits into ei_gepb_traits
8 files changed