updates for next version release
Merge pull request #3418 from yashodha/version-fixes

updates for next version release