Merge branch 'cluster-dashboard' into rails-3_2 (fate#310306)