BLC-572 - refactor all @GeneratedValue annotations to be consistent across all of the BLC entities