DDF-825 Made wait-for http and CSW library methods more generic.