Fixes https://issues.infn.it/jira/browse/VOMS-440
Merge branch 'fix/VOMS-440' into develop