adding scanning
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'release-20' into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into wikiServicesBridge
Delete debugging print statement
Forgotten to uncomment code
Merge pull request #805 from heidiso/wikiServicesBridge

Wiki services bridge / Call to migrate Wikis
[PLFM-2274] Add check for parent cycles before creation/updating
[PLFM-2150] Edit error message thrown when creating duplicate owner entry
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	tools/tool-migration-utility/src/main/java/org/sagebionetworks/tool/migration/v3/StubSynapseAdministration.java
Merge pull request #806 from marcel-blonk/develop

Split up synapse java client to support bridge client
Build fix perhaps
Merge pull request #807 from kaysoky/FixAdminClient

Fix build
+ Delete two unused schemas
+ Split up the schemas for login and user creation
Oops, extra commas
Cleanup the controllers and clients using the changed schemas.  Looks like little or nothing will break as a result of this change.
Change the usage of some schemas
Cleaned up login code to use schemas
too much to put in this message
Merge pull request #809 from heidiso/wikiDaoChanges

Wiki dao changes [PLFM-2274/ PLFM-2150]