Merge proposals dependent on lp://staging/~replaceafill/schooltool.virginia/schooltool.virginia_trunk

1. schooltool.virginia_trunk
2. Dependent merge proposals