Distinguish between output format and delivery channel (web console or zip)

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