fix for release numbers
fix selfupdate version info, copyright updates
Merge branch '2.1' into wip-2.2
fix for update release number