This PR will move the 4.0.x branch closer to the present of master

This PR will move the 4.0.x branch closer to the present of master so we can start using it.
Nick created this branch on 11/16/2012 together with the other repos but we never used it and kept using master. But from now on master will be used for 4.1.x.
This PR moves 4.0.x to 12/21/2012, then skips all the commits from Nick just before Christmas that are related to features/ and sites/ and also one commit updating our parent pom reference to 4.1.0. And on top of this I added Len's newest commit to master.