Merge remote branch 'upstream/master' into phdSSupscaling

Conflicts:
	opm/porsol/common/setupBoundaryConditions.hpp
	opm/porsol/euler/EulerUpstreamImplicit_impl.hpp

Keep some new output to screen and use constant frac flow on inlet.
Also let Periodic BCs only be periodic in pressure drop direction.