Fix the action method returned by entry_admin_update_fn
Merge branch 'master' into pu

* master:
  Fix the action method returned by entry_admin_update_fn