case 3298 - Display author line only if author is available.
case 3298 - Print year if author is not available.
case 3298 - Small refactoring according to CR
Merge branch 'case-3298' into develop