BZ-1001184: integrated form editor with contextual menus
Merge remote-tracking branch 'origin/master'