fixup 'mon, osdmaptool: switch to primary-specifying pg_to_up_acting_osds', change expected output

Signed-off-by: Greg Farnum <greg@inktank.com>