Velocity-scalar correlation modelling in turbulent non-premixed flames: standard second-moment closure and joint velocity-scalar transported PDF modelling [shortened version]