DO NOT MERGE - Juno fixes

This PR contains a running list of changes to pull the quickstack modules in line with OPM Juno.