Archive on publish and discard
Add update key for publish and discard
Add update to signature of archive
Seperate out archive so we can use the updated block with it
Add facia content api key to configuration.scala
Remove setting of apiKey in trait
Add FaciaSolrContentApiClient and FaciaElasticSearchContentApiClient
Add some Option wrapping
Start using .facia from SwitchingContentApiAgent in ParseCollection
Fix apiKey not getting assigned
Merge branch 'master' into facia-contentapi-key
Change to override fetch to add application-name
Remove facia content api key
Move the override to the object
Fix imports
Change archiveBlock to return Option Block and remove weird map
Remove objects
Add queryMessage to item and search methods of ApiQuery
Fix call in test
Merge branch 'master' into facia-contentapi-key

Conflicts:
	common/app/conf/application.scala