Whitespace fixes
b/16300640 Remove references to mockup classes
Merge pull request #1568 from reciprocity/feature/workflow-remove-mockup-tree-references

b/16300640 Remove references to mockup classes