#3411 don't dump the hole config file in the java args, only the 4
needed to get the server started
Minor fix to states test plan.
Merge branch 'master' of github.com:maqetta/maqetta
#3411 from config file maqetta config options
Merge branch 'master' of https://github.com/maqetta/maqetta.git
#3411 code clean up
Don't need jetty config options on cmd line.

The options are read in directly from the conf file and
don't need to be passed on command line.
Revert part of previous commit.
#3411 cleaner exception handling
Merge branch 'master' of https://github.com/maqetta/maqetta.git
Consolidate two icons in the Scenes palette - the focus icon and the
current-state icon. (Note: with current Maqetta, the current-state icon
will have the focus.)
Merge branch 'master' of github.com:maqetta/maqetta
In Scenes palette, replace shining light icon with eyeball icon
Update Java check to version 1.6 in start scripts.
a little more style clean up.  Clear up some warnings, fix indents,
handle all IOExceptions in one place, for now.
Merge branch 'master' of ssh://github.com/maqetta/maqetta
Add option to start server as background task.

… using nohup.
Cleanup LDAP config options.
Update version to 9.
Small updates to comments.
Fix line endings.