Combine upgrade notes for 2.0=>3.0 and 3.0=>3.1