Fixed wrong names used for the base image
Merge remote-tracking branch 'devel/fix_vcs_marker_test' into devel-master