Removed underscore from valid symbols for names used as hostname

Change-Id: I1d1a947c2796346af6b148302d81116c854eaf37
Closes-Bug: #1272049
Fixed reading topology file with newline at the end

Closes-bug: #1271776

Change-Id: I95ea0d785b294a179daad124e0073a8c3cc6a8ee
Merge "Fixed reading topology file with newline at the end"
Merge "Removed underscore from valid symbols for names used as hostname"