[EDG 4.4 and C11] Fixed AST traversal for friend and non-friend template instatiations declared in non-global scope.
Merge remote-tracking branch 'origin/master' into dq-edg4x-rc

Conflicts:
	src/frontend/CxxFrontend/EDG
[EDG 4.4 and C11] Fixed merge conflict and compiler warning.
[EDG 4.4 and C11] Fixed merge conflict and compiler warning.