Activation or workfare? : governance and the neo-liberal convergence