better default setting 

[git-p4: depot-paths = "//depot/private/jchin/HBAR-DTK/": change = 121615]
Merge remote-tracking branch 'p4/master'

better default setting