Resolving issue with FacesContext
Merge remote-tracking branch 'origin/c1_aug2012' into S-Media