Merge proposals dependent on lp://qastaging/~pete-woods/mediascanner2/add-system-session-files

lp://qastaging/~pete-woods/mediascanner2/add-system-session-files has no merge proposals.