jaggr-web and non-osgi sample - Implementation of review comments