[MNG-8461] Initial settings method must restore context state#2004

cstamas merged 2 commits intoapache:masterapache/maven:masterfrom

cstamas:MNG-8461cstamas/maven:MNG-8461Copy head branch name to clipboard