Deal with merge conflicts
One more
Some more clean up plus the issues currently causing scans to fail.
More codestyle work
We're not touching /libraries/joomla or tests.