Fix for bug CREAM-157
Merge branch 'master' of https://github.com/italiangrid/cream-api-java