Merge proposals dependent on lp://qastaging/~elementary-os/elementaryos/os-patch-indicator-session-trusty-old

1. os-patch-indicator-session-trusty-old
2. Dependent merge proposals