Fix review call outs.
Add support for remount options - See #1782
CHEF-1737: Minor clean up.