[KARAF-2690] Fix default context rendering with /
KARAF-2691 Adding pid to output of Info command
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Minor reordering