DC21-515: Add configurable paths for README.html & handle exceptions
Merge remote-tracking branch 'origin/master'