tweaks from conversion test runs
Merge branch 'master' of github.com:jferencak/RPUpgrade