(CE-490) Add option to allow Common.css to load in Oasis
Merge branch 'CE-490' into dev