Merge changes Id11842ad,Id016d8c1

* changes:
  Move roles persistence into APEX.
  Move runtime permissions persistence into APEX.