modify to extract codes even if they have indent spaces. refs #645
modify to show the replaced package declaration. refs #645
Merge branch 'issues_645' into 2.2.0