o Added back <aspectSourceDirectory/> and <integrationUnitTestSourceDirectory/> o Added CDATA notation to some code segments that were causing trouble.