Merge branch 'hotfix-0.5.0-version'
Add newline at the end for appending Hadoop config
Merge branch 'hotfix-0.5.0-config' into develop