Merge pull request #79 from hughsaunders/sprint

Merged automatically by jenkins after successful gate test
Merge pull request #80 from hughsaunders/sprint

Merged automatically by jenkins after successful gate test
add --admin flag to r2
Merge pull request #81 from rpedde/TA134

Merged automatically by jenkins after successful gate test