Combination of searches for heavy resonances decaying into bosonic and leptonic final states using 36 fb-1 of proton-proton collision data at sqrt(s) = 13 TeV with the ATLAS detector