Working on a branch to start reducing the distance for reference_types and action_* branches
Cherry pick model/cardlib move
Fixing tests
cherry pick moving test/unit/card/* tests
ATP
cherry pick 4b1edfc5a633f6c7e5d0e80735367926d54fe20e, completing test move/fixes
more the specs more where they should be
Missed return of @dependents
CP 8e093d0d067bb8892b9847f5d6ae31a690c2d9cd
Cherry picking a line of fixes: 7cf17e14f2d2cdf303345dc7110e7028fa30e01f
more cherry picking 97c02ccf8014f2150a0650ca061fe7653718c021
bringing up more from reference_types
more cleanup
fix sql IN syntax
Add back WANTED_ constants
More cleanup
fixups, add back missing migration
Merge branch 'develop' into load_cardlib
Fix trash back to how it was
merge forward model_cardlib