Fix phpcs warnings/whitespace in upgrader file

Merged DaveD requested to merge DaveD/cdntaxreceipts:whitespace-upgrader into master

This pulls out phpcs and whitespace fixes from some other installer changes for utf8mb4. If viewed with whitespace changes hidden it looks much better.

Merge request reports