fixing issues from registry side for AIRAVATA-1028