Merge pull request #2774 from takahashi-tsc/bugfix-collectdmon-loop