Decrease wait timeout
Pre-install nfs for vagrant template
Merge