Udp option was removed from NFS options list
Merge branch 'irina' of http://github.com/dimakuzminov/incredibuild_deployment into irina