LPS-36977

Hey Tomas, 

I've finished with all the changes I thought were necessary. The only doubt I had is whether to create a ControlPanelUtil class and move the checking logic there, invoking it from ServicePreAction. What do you think?

Also, note that I've barely had time to test this. I would appreciate if you could do that. If it works and you don't want to do significant changes just send it to Brian directly cc'ing me and Ray.