implement changes in vendor and siteinfo
implement changes in vendor and siteinfo and conflicts resolved
Merge branch 'master' of https://github.com/bharat-daffodilsw/cstore