More improvements to includes resolution, mainly performance related
Merge remote-tracking branch 'upstream-cwi/master'
extracted common code to declare variables (addVarDecl) including an assertion, + consistency in layout/formatting
update of declarations (namespace glue to forward slash, variable to (globalVar|functionVar|methodVar), param to (methodParam|functionParam), const to (constant|classConstant)