Adds javadoc for feeds
fix hello-world.war for jboss6

- use separate servlet-mapping elements for each url-pattern;
  previously had been changed for testing url-mappings to have:
    <servlet-mapping>
        <servlet-name>HelloServlet</servlet-name>
        <url-pattern>/hello</url-pattern>
        <url-pattern>/hello/*</url-pattern>
        <url-pattern>/goodbye/*</url-pattern>
    </servlet-mapping>
Fix TomcatServerIntegrationTest
Fix ControlledDynamicWebAppCluster rebind test

- The DeferredSupplier anonymous inner class used in the cluster's
  config was not serializable
Merge pull request #467 from aledsage/fix/IntegrationTests

Fix integration tests
consistent javadoc usage of @code
deprecate unused AbstractCombiningEnricher
Merge pull request #466 from aledsage/fix/adds-javadoc-for-feeds

Adds javadoc for feeds
Fix SensorRegistryTest (due to rename of setUp)
Fix DynamicGroupTest: annotate setup with alwaysRun
Fix SshjToolLiveTest (when sh instead of bash)
Improve err on SshjToolLiveTest.assertRemoteFileLastModifiedIsNow

- Test failed in jenkins, perhaps due to time zone?
Issue #469: Changing whirr-cli dependency scope to test and adding exclusions for unwanted servlet-api versions
Issue #469: Removing whirr-cli fron the brooklyn-all dependencies
Issue #469: Remove unused import
Merge pull request #471 from grkvlt/Issue-469

Issue #469 Fix
Fix ShellFeedIntegrationTest.testDiskUsage

- on jenkins, last disk has usage size 0
Fix SshjToolLiveTest (disable failing part of test)

- The lastModified time check was failing because on jenkins the jvm 
  locale and the OS locale are different (i.e. different timezones) so 
  the file time-stamp is several hours out.
update to version history to present 0.4.0
don't show ID in the app tree, just show the entity name (where it matters the ID is usually in the name,
and where it doesn't matter it is ugly noise)