Changed hardcoded 'hadoop' hdfs user name to template

+ rephrased to remove period just after the HDFS path.

Change-Id: I724fd5c25f0ab2e895367c1784cf9ece800923d2
Closes-Bug: #1372504
Merge "Changed hardcoded 'hadoop' hdfs user name to template"