Fixups for previous commit (missed a few things)

This revision passes all tests and also works in Eclipse with the "uf-15"
branch of uberfire-tutorial