Merge proposals dependent on lp:~vila/ols-config/trunk

lp:~vila/ols-config/trunk has no merge proposals.