correct typo
Delete deprecated code

- Code deprecated in 0.4
- Deprecate groovy code in brooklyn.entity.adapter, which requires
  updating some entities to use the new feeds
- Convert some code from groovy to java, to make testing/fixing easier
Fix JmxFeed blocking on start when connection fails

- Previously start() could block for 120 seconds if JMX end-point
  was down; not good for rebind in particular.
- Now JmxFeed does the connect() asynchronously
Upgrade jclouds to 1.6.0 (was 1.6.0-rc.4)
Converts ShellUtils.groovy -> ShellUtils.java
Fix failing JmxFeedTest regression
Merge pull request #740 from aledsage/delete/deprecated-code

Delete deprecated code
Use stopwatch.elapsed(MILLISECONDS) instead of elapsedMillis

- elapsedMillis was deprecated in guava 14, so updating to
  use the new stopwatch.elapsed(TimeUnit.MILLISECONDS)
Merge pull request #742 from aledsage/upgrade/jclouds-to-1.6-ga

Upgrade jclouds to 1.6.0 (was 1.6.0-rc.4)
Merge pull request #746 from aledsage/fix/update-stopwatch-elapsedMillis

Use stopwatch.elapsed(MILLISECONDS) instead of elapsedMillis
Converts ShellUtils.groovy -> ShellUtils.java
ShellUtils exception rethrowing cleanup
Added a missing TimeUnit important that caused by WebAppIntegrationTest to fail
resolved merge conflicts
Fix SoftwareProcess.connectServiceUpIsRunning
Merge branch 'master' of github.com:brooklyncentral/brooklyn

Conflicts:
	docs/meta/versions.md -- 0.6 added, and v remvoed from 0.4
create new utils/ dir and moved the easily-moved classes from brooklyn.util across
moved jmx projects to utils/
removing groovy from utils-common, creating new utils-groovy
tidy structure of utils project, removing deprecated classes