Merge pull request #729 from ControlSystemStudio/bug723_rhino_vs_jdk

opibuilder: Add preference java_script_engine=RHINO or JDK
Update feature.xml
Update pom.xml
Merge branch 'master' into bug727_circ_buffer_clear

Conflicts:
	applications/features/org.csstudio.scan.ui.feature/feature.xml
	applications/features/org.csstudio.scan.ui.feature/pom.xml
Merge branch 'bug727_circ_buffer_clear'
Merge pull request #731 from ControlSystemStudio/bug685_tests

o.c.alarm.beast.server.test: Update to function with current server
Merge pull request #732 from ControlSystemStudio/bug640

o.c.pvmanager.widgets: ServiceButton logs error
Merge remote-tracking branch 'origin/master' into sns