Update aviary call due to signature change from Ticket #3651
Ticket #3679. Preventing submission of mpi universe jobs.
Merge branch 'V8_0-branch'