[KARAF-3112]make stopTimeout of AdminService configurable
Merge branch 'karaf-2.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x