Simon, a word of caution*, I believe that anything that goes into the Apache repository will need to be copyright The Apache Software Foundation and only The Apache Software Foundation. (Just look at the bottom
No, the contribution is covered by the CLA (which you should have read and signed too ;-)
See http://www.apache.org/licenses/#clas, paragraph 2:
You hereby grant to the Foundation a non-exclusive, irrevocable, worldwide, no-charge, transferable copyright license to use, execute, prepare derivative works of, and distribute (internally and externally, in object code and, if included in your Contributions, source code form) your Contributions. Except for the rights granted to the Foundation in this paragraph, You reserve all right, title and interest in and to your Contributions.