[SYNCOPE-635] fixes
[SYNCOPE-635] fixes

apache/syncope,NuwanSameera/syncope,ilgrosso/syncope,NuwanSameera/syncope,NuwanSameera/syncope,nscendoni/syncope,massx1/syncope,giacomolm/syncope,tmess567/syncope,securny/syncope,nscendoni/syncope,tmess567/syncope,apache/syncope,ilgrosso/syncope,nscendoni/syncope,giacomolm/syncope,nscendoni/syncope,securny/syncope,massx1/syncope,NuwanSameera/syncope,securny/syncope,apache/syncope,tmess567/syncope,ilgrosso/syncope,ilgrosso/syncope,tmess567/syncope,apache/syncope,securny/syncope,giacomolm/syncope,massx1/syncope,giacomolm/syncope