OWB-961 more sample fixes...


git-svn-id: https://svn.apache.org/repos/asf/openwebbeans/branches/owb_1.2.x@1598925 13f79535-47bb-0310-9956-ffa450edef68