Missing oldversion cause upgrade of module to fail
Allow multiple invocation plus minor improvements
merge from master branch