fixing a few issues with the web-services

fixing a few issues with the web-services
Merge branch '7280-working-on-web-services-in-FSFW' into 1.0.2-dev