Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cern-stubs/accsoft/commons/ccs/__init__.pyi
#	cern-stubs/accsoft/commons/diag/__init__.pyi
#	cern-stubs/accsoft/commons/diag/config/__init__.pyi
#	cern-stubs/accsoft/commons/diag/matcher/__init__.pyi
#	cern-stubs/accsoft/commons/diag/matcher/ccdb/__init__.pyi
#	cern-stubs/accsoft/commons/diag/matcher/cmw/__init__.pyi
#	cern-stubs/accsoft/commons/diag/matcher/cmw/fesa/__init__.pyi
#	cern-stubs/accsoft/commons/diag/matcher/japc/__init__.pyi
#	cern-stubs/accsoft/commons/diag/matcher/rbac/__init__.pyi
#	cern-stubs/accsoft/commons/diag/matcher/tgm/__init__.pyi
#	cern-stubs/accsoft/commons/domain/__init__.pyi
#	cern-stubs/accsoft/commons/domain/json/__init__.pyi
#	cern-stubs/accsoft/commons/domain/json/defaultobjects/__init__.pyi
#	cern-stubs/accsoft/commons/domain/json/modules/__init__.pyi
#	cern-stubs/accsoft/commons/domain/json/modules/cern/__init__.pyi
#	cern-stubs/accsoft/commons/domain/particletransfers/__init__.pyi
#	cern-stubs/accsoft/commons/domain/zones/__init__.pyi
#	cern-stubs/accsoft/commons/rest/core/__init__.pyi
#	cern-stubs/accsoft/commons/rest/core/annotations/__init__.pyi
#	cern-stubs/accsoft/commons/rest/core/enums/__init__.pyi
#	cern-stubs/accsoft/commons/rest/core/exceptions/__init__.pyi
#	cern-stubs/accsoft/commons/rest/core/maps/__init__.pyi
#	cern-stubs/accsoft/commons/util/__init__.pyi
#	cern-stubs/accsoft/commons/util/collections/__init__.pyi
#	cern-stubs/accsoft/commons/value/__init__.pyi
#	cern-stubs/accsoft/commons/value/expression/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/array/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/array2d/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/common/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/descriptor/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/function/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/function/discrete/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/function/discrete/array/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/function/discrete/list/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/function/polynomial/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/function/polynomial/bounded/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/function/polynomial/bounded/sequence/__init__.pyi
#	cern-stubs/accsoft/commons/value/json/scalar/__init__.pyi
#	cern-stubs/accsoft/commons/value/operation/__init__.pyi
#	cern-stubs/accsoft/commons/value/operation/factory/__init__.pyi
#	cern-stubs/accsoft/commons/value/spi/__init__.pyi
#	cern-stubs/accsoft/commons/value/spi/function/__init__.pyi
#	cern-stubs/accsoft/commons/value/spi/operation/__init__.pyi
#	cern-stubs/accsoft/commons/value/spi/operation/factory/__init__.pyi
#	cern-stubs/japc/core/__init__.pyi
#	cern-stubs/japc/core/device/__init__.pyi
#	cern-stubs/japc/core/device/impl/__init__.pyi
#	cern-stubs/japc/core/directory/client/__init__.pyi
#	cern-stubs/japc/core/directory/client/services/__init__.pyi
#	cern-stubs/japc/core/directory/client/spi/__init__.pyi
#	cern-stubs/japc/core/factory/__init__.pyi
#	cern-stubs/japc/core/group/__init__.pyi
#	cern-stubs/japc/core/group/support/__init__.pyi
#	cern-stubs/japc/core/spi/__init__.pyi
#	cern-stubs/japc/core/spi/adaptation/__init__.pyi
#	cern-stubs/japc/core/spi/arraycall/__init__.pyi
#	cern-stubs/japc/core/spi/arraycall/group/__init__.pyi
#	cern-stubs/japc/core/spi/beans/__init__.pyi
#	cern-stubs/japc/core/spi/cache/__init__.pyi
#	cern-stubs/japc/core/spi/factory/__init__.pyi
#	cern-stubs/japc/core/spi/factory/impl/__init__.pyi
#	cern-stubs/japc/core/spi/group/__init__.pyi
#	cern-stubs/japc/core/spi/jmx/__init__.pyi
#	cern-stubs/japc/core/spi/provider/__init__.pyi
#	cern-stubs/japc/core/spi/subscription/__init__.pyi
#	cern-stubs/japc/core/spi/transaction/__init__.pyi
#	cern-stubs/japc/core/spi/util/__init__.pyi
#	cern-stubs/japc/core/spi/value/__init__.pyi
#	cern-stubs/japc/core/support/__init__.pyi
#	cern-stubs/japc/core/transaction/__init__.pyi
#	cern-stubs/japc/core/trigger/__init__.pyi
#	cern-stubs/japc/core/util/__init__.pyi
#	cern-stubs/japc/value/__init__.pyi
#	cern-stubs/japc/value/factory/__init__.pyi
#	cern-stubs/japc/value/spi/util/__init__.pyi
#	cern-stubs/japc/value/spi/value/__init__.pyi
#	cern-stubs/japc/value/spi/value/core/__init__.pyi
#	cern-stubs/japc/value/spi/value/simple/__init__.pyi
#	cern-stubs/lsa/client/__init__.pyi
#	cern-stubs/lsa/client/common/__init__.pyi
#	cern-stubs/lsa/client/common/test/__init__.pyi
#	cern-stubs/lsa/client/resolver/__init__.pyi
#	cern-stubs/lsa/client/rest/api/v1/__init__.pyi
#	cern-stubs/lsa/client/rest/api/v1/dto/devices/__init__.pyi
#	cern-stubs/lsa/client/rest/api/v1/dto/parameter/__init__.pyi
#	cern-stubs/lsa/client/rest/api/v1/feign/__init__.pyi
#	cern-stubs/lsa/client/rest/cern/api/v1/__init__.pyi
#	cern-stubs/lsa/client/rest/cern/api/v1/feign/__init__.pyi
#	cern-stubs/lsa/client/spi/rba/__init__.pyi
#	cern-stubs/lsa/domain/cern/optics/ofb/__init__.pyi
#	cern-stubs/lsa/domain/cern/settings/__init__.pyi
#	cern-stubs/lsa/domain/commons/__init__.pyi
#	cern-stubs/lsa/domain/commons/cache/__init__.pyi
#	cern-stubs/lsa/domain/devices/__init__.pyi
#	cern-stubs/lsa/domain/devices/type/__init__.pyi
#	cern-stubs/lsa/domain/exploitation/__init__.pyi
#	cern-stubs/lsa/domain/optics/__init__.pyi
#	cern-stubs/lsa/domain/settings/__init__.pyi
#	cern-stubs/lsa/domain/settings/spi/__init__.pyi
#	cern-stubs/rbac/common/__init__.pyi
#	cern-stubs/rbac/common/authentication/__init__.pyi
#	cern-stubs/rbac/common/authorization/__init__.pyi
#	cern-stubs/rbac/common/impl/__init__.pyi
#	cern-stubs/rbac/common/impl/decode/__init__.pyi
#	cern-stubs/rbac/common/impl/exec_/__init__.pyi
#	cern-stubs/rbac/common/impl/keys/__init__.pyi
#	cern-stubs/rbac/common/impl/request/__init__.pyi
#	cern-stubs/rbac/common/impl/response/__init__.pyi
#	cern-stubs/rbac/common/impl/serialization/__init__.pyi
#	cern-stubs/rbac/common/impl/serialization/decode/__init__.pyi
#	cern-stubs/rbac/common/test/__init__.pyi