Fixed blocking in RegisterInRemoteCatalog
Merge branch 'local' into develop

Conflicts:
	catalog/device/utils.go
	catalog/service/utils.go