OWB-961 more sample improvements


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