Operator shelf edit form (bug 1074431)

r? @ngokevin @cvan @spasovski 
love the Aviary usage.