Fixing broken patch 20957a1

Also adds integration tests for nested includes with conditionals