Mitigate ATLASSIM-7260 by updating the references.
/cc @jchapman @jcatmore @mbandier @schaarsc @abarton