Merge pull request #692 from google/flownodes

oboe: renamed flowgraph classes