Merge pull request #3891 from birarda/master

fix for delayed domain-server heartbeats
fix URL/filename discrepancy for local scripts