advance enyo, onyx, and layout to 2.2

Found and fixed three bugs that results from the move. Otherwise everything looks pretty good.