Merge proposals dependent on lp://staging/~mhall119/onehundredscopes/unity-planetubuntu-scope

1. unity-planetubuntu-scope
2. Dependent merge proposals