Fixing a few inconsistencies with file name conventions
Merge branch 'v1.15' of ssh://github.com/openexo/cloud-kepler into v1.15