Search for charged Higgs bosons decaying via H±→ τ±ντin the τ+jets and τ+lepton final states with 36 fb−1of pp collision data recorded at sqrt(s) = 13 TeV with the ATLAS experiment