Changed plan wrapper to deal with ActivityImpl to retain the facility Id.
Authored by: jwjoubert 2012-09-26
Parent: [r21127]
Child: [r21129]