Fixed my issues. Sadly, the install states don't seem to work the way they used to. I had to change my custom action to set the requested state. This is like the 3rd set of conditionals that have been broken on upgrades in the last few releases. Regardless, this article helped me: https://msdn.microsoft.com/en-us/librar ... 85%29.aspx
I think you may have posted this somewhere Daniel.