integrate AST rewriter#674

robertoraggi merged 2 commits intomainrobertoraggi/cplusplus:mainfrom

civic-wolverinerobertoraggi/cplusplus:civic-wolverineCopy head branch name to clipboard