Look for both underscores and - when finding version
Fixes EUCA-9068