use refactored api classes also for sites, CPU-268
Merge remote-tracking branch 'origin/master'