Merge Flex changes to velocity with Velocity 1.4 (http://archive.apache.org/dist/velocity/engine/1.4/velocity-1.4.tar.gz) in preparation for forking and changing the package name.