Merge "Stop setting net.hostname"