Fix #2945: Reference correct options variable
Ensure options[:mount_options] is defined before checking if it includes key
Merge pull request #2946 from mhahn/fix/master/2945

Fix #2945: Reference correct options variable