selective upgrade option + ref update fixes
Merge branch 'master' into cnxml-to-html-v3