#4308 Stop edit routine form being submitted with enter

Signed-off-by: Umair Khan <omerjerk@gmail.com>
Merge pull request #993 from omerjerk/QA_4_1

#4308 Stop edit routine form being submitted with enter
ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
Fix bug#4307 Nav: "Columns" wont expand with specific schema

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
Merge pull request #997 from smita786/bugfix-4307

bug fix #4307
changelog entry for 4307

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Merge branch 'QA_4_1'