Use path.resolve for views dir instead of concat

closes #2165
Merge remote-tracking branch 'upstream/master'