Merge "Fix INF-344 resourceType fields on alarmDictionary"

diff --cc o2ims/adapter/orm.py
Simple merge

diff --cc o2ims/domain/ocloud.py
Simple merge

diff --cc o2ims/service/auditor/pserver_acc_handler.py
Simple merge

diff --cc o2ims/service/auditor/pserver_cpu_handler.py
Simple merge

diff --cc o2ims/service/auditor/pserver_eth_handler.py
Simple merge

diff --cc o2ims/service/auditor/pserver_handler.py
Simple merge

diff --cc o2ims/service/auditor/pserver_if_handler.py
Simple merge

diff --cc o2ims/service/auditor/pserver_mem_handler.py
Simple merge

diff --cc o2ims/views/ocloud_dto.py
Simple merge

diff --cc o2ims/views/ocloud_route.py
Simple merge

diff --cc o2ims/views/ocloud_view.py
Simple merge