Merge pull request #871 from sanger/next_release

Rollback to trinidad
fix_bulk_submission_when_no_asset_group
Fix cherrypick cancellation
Merge pull request #873 from JamesGlover/fix_cherrypick_cancellation_properly

Fix cherrypick cancellation properly