Irving/11.next fix testing

Testing and tracking the following bugfixes:
OC-11297
OC-11382
OC-11657

Also much improved method of running, retrying and outputing p-c-c reconfigure/upgrade commands