Self-manage noflo and noflo-test
Merge branch 'refs/heads/develop'