differentiate between 1.7 changes and 1.6.2 changes
differentiate between 1.7 changes and 1.6.2 changes

git-svn-id: efce15992eafbd71412d600875d997890b9afd93@730589 13f79535-47bb-0310-9956-ffa450edef68

diydyq/velocity-engine,pcollaog/velocity-engine,pcollaog/velocity-engine,diydyq/velocity-engine