Merge "Register @Listen annotated classes in Http and Ssh modules" into stable-2.6