[UPDATE] enhancements to avoid PHP warning and better schema location determination
Authored by: mikaelcom 2012-12-06
Parent: [r197]
Child: [r199]
