Pull from correct branch.
Use local orion.server repo.
Pull server.configurator from special branch.
Allow Git update of maqetta repo.

Better clone support.
Merge branch 'master' into orion-war

* master:
  Import javax.servlet as a library, not plugin.
  Fix javax.servlet import version.
  Fix another small bug in Manage States dialog. Update test case for States palette.
  Comment out all the LDAP props.
  Update themeset test plan to match latest UI.
Point to new tags with javax.servlet import fix.
Update map to use tag, not branch.
Remove upper-bound version for javax.servlet import.

Allow use of javax.servlet v3.0.
Revert "Remove upper-bound version for javax.servlet import."

I was wrong: the library which implements Javax Servlet API v3.0 has
version 2.6.
This reverts commit 3dbe30e51ede34a39973afb8544501f420f534dd.
Fix line endings.
Merge branch 'master' into orion-war

* master:
  Small updates to comments.
  Update version to 9.
  Cleanup LDAP config options.
  Add option to start server as background task.
  a little more style clean up.  Clear up some warnings, fix indents, handle all IOExceptions in one place, for now.
  Update Java check to version 1.6 in start scripts.
  In Scenes palette, replace shining light icon with eyeball icon
  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.)
  #3411 cleaner exception handling
  Don't need jetty config options on cmd line.
  #3411 code clean up
  #3411 from config file maqetta config options
  Minor fix to states test plan.
  #3411 don't dump the hole config file in the java args, only the 4 needed to get the server started

Conflicts:
	releng/davinci.releng/orion/builder/scripts/maqetta.server.win.bat
Use `getDavinciProperty()`, to work in WAR.

Also, fix some warning.s
Make sure to download all tags.
Don't try to read config file if in WAR.
Get "orion.auth.name" prop using getDavinciProperty.

Will make it work within WAR.
fetch --all, instead of --tags.
Revert "fetch --all, instead of --tags."

This reverts commit df2c7e9680cbedaeb630bfa93577554c25a82a87.
Use getDavinciProperty(), to work in WAR.
Revert "Don't try to read config file if in WAR."

Will use "maqetta.conf" file for WAR, as well.
This reverts commit 325468719d20db66dfa5f93959ffe82130005a99.
Merge remote-tracking branch 'origin/master' into orion-war

* origin/master:
  fix error caused by da5ca45c2fccae7449cb29f48663aab2876cf9f7
  Fix paste icon background-position - was off by 6px
  Runtime reference was bad.  Need to find a better solution.  Fixes #3690
  Fixes #3684 - after changing shapes.Text to use HTML instead of SVG, needed to add a getChildrenData() helper. (Didn't need this for html.label because we have a special case line of code for html.* widgets in maqetta.client.core).
  Fixes #3688 - area select never worked if page was scrolled. Trivial fix: use Maqetta's bounds logic rather than Dojo's.
  Fixes #3683 - for selection operations, was putting current widget on the helper object, but the helper object is a singleton, so area select would only select a single shapes.Line (or shapes.Arrow or polyline or polylinearrow) and not all shapes within the area select rectangle.
Merge branch 'master' into orion-war

* master:
  Update all icons on the Scenes palette toolbar. Also update the Rename icon on the Files palette.
  #3704 use relative path to walcome for logout
  remove unused code
  use relative cmd/ url #19
  #3704 temp debugger to help debug in war deployment
  #3704 logout in war file context
  #3702 changed absolute path to dojo to relative path
  Minor update to test plan file