master-qa-12161

https://issues.liferay.com/browse/LIFERAYQA-12161

Hi Brian. I've added another commit on top of what I sent in the previous pull.

1. I split up the plugins deployment into 2 targets and called those targets in "run-simple-server" -> "deploy-required-plugins" and "deploy-regular-plugins"
2. I added comments in "deploy-regular-plugins" to indicate what the target is doing. For the first comment at the beginning of the target, ant format-source adds an extra line break before the comment. If the formatting shouldn't look like that, it's probably ok to just remove the comment altogether.

This will not cherry-pick into ee-6.1.x/ee-6.1.30 because 6.1 does not require marketplace-portlet like 6.2 and master do. So ee-6.1.x/ee-6.1.30 will not have "deploy-required-plugins".

Call me over if you have any questions or want me to change the way I did it.