NAT-329 fixed conflicts from merge develop

README.md

build-docs.sh

docs/source/conf.py

docs/source/glossary.rst

docs/source/module/api/v1/index.rst

docs/source/module/api/v1/subscriptions.rst

docs/source/module/products/index.rst

docs/source/module/products/product_types/index.rst

docs/source/module/products/product_types/iptrunk.rst

docs/source/module/products/product_types/router.rst

docs/source/module/products/product_types/site.rst

docs/source/module/schedules/index.rst

docs/source/module/schedules/scheduling.rst

docs/source/module/schedules/task_vacuum.rst

docs/source/module/schedules/validate_products.rst

docs/source/module/schedules/validate_subscriptions.rst

docs/source/module/schemas/imports.rst

docs/source/module/schemas/index.rst

docs/source/module/schemas/types.rst

docs/source/module/utils/helpers.rst