Include automator and provider types in the export and import
calls.
Merge remote-tracking branch 'origin/develop' into feature/add-plugin-types-to-export-import

Conflicts:
	server/src/main/java/com/continuuity/loom/http/LoomAdminHandler.java
Merge remote-tracking branch 'origin/develop' into feature/add-plugin-types-to-export-import

Conflicts:
	server/src/main/java/com/continuuity/loom/http/handler/LoomAdminHandler.java
Merge pull request #246 from continuuity/feature/add-plugin-types-to-export-import

Include automator and provider types in the export and import