Upgrade chapter 6, 7 and 10 to 2.1-RC2 and fix Amazon S3 uploader