move mergePaths to Urls (so it is available from utils)
fix merge path problem when empty segment being added
EntityProxy: don't use groovyism for invoking effector

- Use EffectorUtils.invokeEffector directly, rather than 
  calling ((AbstractEntity)delegate).invokeMethod.
Prep for converting AbstractEntity to java
Convert AbstractEntity from groovy to java
MethodEffector.call: handle when entity is proxy
Convert EntityPerformanceTest to java, and fix
AbstractEntity conversion: other required fixes
Updating EffectorSayHiTest (for pure-java AbstractEntity)
Fixing tests (converting to use EntitySpec etc)
Converting FollowTheSun and LoadBalancingPolicy tests to java
LocalEntityManager: assert proxy not null
Converts LocalEntitiesTest from groovy to java
Convert/fix JavaSoftwareProcessSshDriverIntegrationTest (groovy to java)
Convert webapp tests from groovy to java
Convert WebAppIntegrationTest from groovy to java
Fix string msg in TomcatServerIntegrationTest
Location memento generation: ensure parent included
Merge pull request #762 from aledsage/convert/AbstractEntity-to-java

Convert AbstractEntity to java