Merge "Remove some unnecessary man page entries" into jb-dev