ove_2#21665 - Removing last underscore from remote directory name if
present