Merge pull request #10636 from seanwalbran/fix-asset-host-proc-returning-nil

fix rails4 regression with asset_host Proc returning nil