bringing back the old detection (until find the reason why upnp does not work from time to time)
Merge branch 'master' of https://github.com/appsgate2015/appsgate