Merge pull request #334 from rajklair/master

cr:818807 - print log file name on error
updated catalogs for sim apps; rev 1.9
remove extra files and dir
cr:823078 - refactored include dirs processing code to improve runtime performance