Avoiding multiple registration between core proxy and ehmi proxy
Merge branch 'master' of https://github.com/appsgate2015/appsgate