Merge "Add ability to configure nfs_mount_options   - updated test pillars"