master-qa-12235

https://issues.liferay.com/browse/LIFERAYQA-12235

First commit:
1. I changed the marketplace plugins deploy in "deploy-required-plugins" to use direct-deploy instead. I also added in a conditional to change properties for marketplace if we want to connect to staging. I used ${marketplace.portlet.properties} instead of hard coding because those properties shouldn't be public.

Second commit:
1. Since we're using direct-deploy there is no longer a marketplace war file dropped into the deploy folder. If we needed to set up additional bundles (like for clustering), the additional bundles won't have marketplace direct-deployed, so I moved "prepare-additional-bundles" (which makes copies of the first bundle) to occur after plugins deployment.
2. I removed the part in "deploy-specified-plugins" that copies over the deploy folder because we can just do that in prepare-additional-bundles as long as prepare-additional-bundles is called after deploy-specified-plugins. This way we won't need the antelope:repeat in deploy-specified-plugins.
3. I moved the web.xml conditional up as well because it should occur before prepare-additional-bundles.

For ee-6.1.x/ee-6.1.30 there is no marketplace deployment in our tests, but I still wanted to apply the second commit to it. You'll have to pull ee-6.1.x and ee-6.1.30 separately because ee-6.1.x will not cherry-pick into ee-6.1.30.

If you have questions or any of this doesn't make sense then you can skype me or call me over.