Use minimally-invasive approach to allowing build by non-root user
Disabling cgroups on F18 EC2 builds due to kernel panic issues.
Merge remote branch 'upstream/master' into run-as-user
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'run-as-user', remote branch 'upstream/master'