Fix merge conflict introduced in when merging master->ux-release-1
Fix merge conflict introduced in when merging master->ux-release-1

Bug was introduced in merge commit
cb6fe50832af2103d0d09bd5fdda405101a40dc6 and resulted in import
into inventories not working.

Ducz0r/scinote-web,mlorb/scinote-web,Ducz0r/scinote-web,Ducz0r/scinote-web,mlorb/scinote-web,mlorb/scinote-web