Merge pull request #1 from mongodb/master

Merge in latest from mongodb/morphia
Add variants of ensureIndexes() that accept String collectionName parameter
Unit tests for new ensureIndexes methods.
new constrcutor for configuring own mapper class
Merge pull request #2 from mongodb/master

Merge in latest from mongodb/morphia
Merge branch 'master' into Collection-name-indexes

Conflicts:
	morphia/src/main/java/org/mongodb/morphia/DatastoreImpl.java
Fix compile errors in TestIndexCollections
Added support for the $setOnInsert operator
add doc
Merge pull request #550 from locked-fg/master

added 2 JavaDoc comments in AdvancedDatastore
Merge pull request #549 from ctrimble/feature_set-on-insert

Added support for the $setOnInsert operator
check the server version.  setOnInsert didn't exist in 2.2
add server version check
checkstyle fixes
check server version
try a reverse version check
change upper bound of versions of the driver
try increasing RAM for the gradle tests
try increasing RAM for the gradle tests
try increasing RAM for the gradle tests