DDF-924 added content as a default app
Merge branch 'master' of https://github.com/codice/ddf
DDF-799 added the cipher and protocols to the system.settings file.  Also removed the keystore and truststore properties from platform config file