[MAESTRO-3234] add back missing jira field

Better ways to do this with context now, but for present keep existing
functionality.
avoid NPE in tests due to incorrect assertion