0000265: ESI Edge-Arch 1.0 support (Surrogate Capability / Control)

Automatically move capabilities to the edge surrogate (if not
Surrogate-Control is returned)
Fixed cache issue
More testing
Fixed checkstyle warnings and javadoc
Fixed checkstyle warning