Revert "Trimmed the branch to only the scitos_mira sub directory"

This reverts commit 7922eec7211b4398874709bd5ddf96a839edf982.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the scitos_mira sub directory