Don't generate a scaffold.css if no-assets
Merge pull request #9837 from kjg/no_scaffold_css_when_no_assets

Don't generate a scaffold.css when --no-assets is specified
Use ruby-oci8 master