Merge "Logically separate OF plugin from controller distribution bundle."