Merge proposals dependent on lp://qastaging/~karl-schock/ubuntu-desktop-course/ubuntu-desktop-course-german

1. ubuntu-desktop-course-german
2. Dependent merge proposals