Search for charged Higgs bosons decaying via H-+/- -> tau(+/-)nu(tau) in the tau plus jets and tau plus lepton final states with 36 fb(-1) of pp collision data recorded at root s=13 TeV with the ATLAS experiment