Fix how we transfer mapping directives to the job, ensuring that directives that can be given outside of a mapping policy (e.g., oversubscribe and no-use-local) are retained.

cmr=v1.7.4:reviewer=jsquyres:subject=Fix how we transfer mapping directives to the job