Merge proposals dependent on lp://qastaging/~naguilarg/ubuntu-desktop-course/ubuntu-desktop-course-branch-n0rman

1. ubuntu-desktop-course-branch-n0rman
2. Dependent merge proposals