Fix calling manifest when manifest_url is defined

[rdrazny]

What does this PR do?

PR #704 added a fix for manifest_content, but manifest_url is still ignored. manifest.yml is still not included when manifest_url is defined.

How should this be tested?

Manual test only.

Is there a relevant Issue open for this?

No.

Other Relevant info, PRs, etc

#704

[sean-m-sullivan]

Good catch, LGTM, however going to have to peek under the hood to figure out if the test failures are from this or not, I don't think they are but want to double check.

[rdrazny]

Good catch, LGTM, however going to have to peek under the hood to figure out if the test failures are from this or not, I don't think they are but want to double check.

Looks like content_objects "Survey Template with vars no org" and "workflow_test_template" have switched order in the actual output, and that's enough to throw the diff module off.

[ivarmu]

I think replaying the failed jobs will work ok. It may be caused by a temporary connection issues when fetching the objects from the API. Also... only two of the test jobs are failing... it doesn't seem to be a real error in the code...