SSP-2462,SSP-2463 Cleaned names, dropped consumerKey as column, adjusted liquibase to avoid merge conflicts, some cleanup