Merge branch '0.5.2_intial_state_actionrun_bug' of github.com:dnephin/Tron into release_0.5.2
Merge branch '0.5.2_state_migration_tools' of github.com:dnephin/Tron into release_0.5.2
Merge branch 'r0.5.2_config_hash_verify' of github.com:dnephin/Tron into release_0.5.2
Merge branch 'release_0.5.2' of github.com:Yelp/Tron into release_0.5.2
Add missing template to manifest and missing patch to migration script.