Solving refactoring errors
Merge branch 'vtam.amsoil' of https://github.com/fp7-ofelia/ocf into vtam.amsoil