Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev