Generalize Upwind class to work for Riemann solvers

@samuel and @leopold.stadler have different application where a Riemann solver is necessary for the advective term. The current interface of the Upwind scheme was meant to accommodate such schemes but seems to be not general enough.