Merge proposals dependent on lp://staging/~abreu-alexandre/unity-webapps-qml/content-hub-fail-safe-14-10

1. content-hub-fail-safe-14-10
2. Dependent merge proposals