Merge change 6123

* changes:
  Adding focus and keyboard support to the form plugin.