Australian cabinet reshuffle sees new trade minister and China critic in defence