Merge proposals dependent on lp://qastaging/~boiko/history-service/fix_telepathy_init_on_qml

lp://qastaging/~boiko/history-service/fix_telepathy_init_on_qml has no merge proposals.