merge in sample fixes from owb-1.2.x


git-svn-id: https://svn.apache.org/repos/asf/openwebbeans/trunk@1606559 13f79535-47bb-0310-9956-ffa450edef68