Merge pull request #49 from daniellemayne/develop

bugz 4626: set normal priority shares for cpu and memory: develop
Merge remote-tracking branch 'upstream/develop' into develop