Updated based on Mojarra 2.2.0 final.  Only needed to bump our version number.