Upgraded to ES 1.2.0.

Updated remote node client during discovery.
Merge branch 'performance-fixes' into two-dot-o

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java