fixed up properties loading and DRY'ed up the context between web and OSGI deployment

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