Merge branch 'master' of rosecompiler:rose/edg4x/rose
(roseHPCToolkit)
* workaround about more accurate SgFunctionDefinition's file line info:
  using its function declaration instead for mapping to profiling IR
* changed a few reference output: SgForInitStatement should not share
 metrics with its child SgExprStatement.
Merge remote branch 'origin/master' into HEAD