Looks like funcational inline inclusion, supporting overriding.  Needs more comprehensive testing.
Unit Tests
Improving junit tests.
notes
Merge branch 'master' into override-with-inline-include
Updating inclusion