Added v0.6.4 support for operators merge(),unset(),immutable(),imerge() and iunset(). Sub-key option has been renamed to the resource name rather then pepa
Fixed pylint erro 219
Added line at end of file
No line at the end of file
Merge pull request #15954 from rallytime/bp-15619

Backport #15619 to 2014.7