Measurement of Upsilon production in pp collisions at sqrt(s) = 7 TeV