[Bug 225790] Merge Review: geronimo-specs