WF-1662 - Fixed
WF-1664 - Fixed, added rbac admin prefix for name, value, property and properties