pull npg_daemon_control utility and a few other cmall changes