CVS keywords + header added
TODO: AWS added. First AWS backports added