complete support for dynamically uploaded adoptions and tams

[denised]

Currently both of these are partially implemented, but more work is required to finish them off:

• Per discussion with @sutjin , if an override is provided for the tam, the code needs to not evaluate the default behavior.
• The adoption code needs to be sure that the correct adoption flags are set in the override case (currently it would use whatever flags were present for the regular adoption).