adding libfreetype6-dev
Merge pull request #1540 from edx/han/libfreetype6-dev

adding libfreetype6-dev to release
New base AMI, updating AMIs for Ubuntu
Merge pull request #1563 from edx/han/release-sandbox-ami

New base AMI, updating AMIs for Ubuntu
replace geturl with a shell out to curl - to fix broken certificate management
Merge pull request #1631 from edx/han/release-fix-geturl

replace geturl with a shell out to curl - to fix broken certificate mana...
Add the new version of apt.
validate certs=no on apt_repository due to ansible bug
Switch to using the new apt_repository module.
Merge pull request #1645 from edx/derf/ignore_cert_validations

Derf/ignore cert validations
Don't restart edxapp after updating on devstack

- when using `/edx/bin/update edx-platform (branch)`
Added Brandon DeRosier to authors
Add sane defaults for djfs.

Conflicts:
	playbooks/roles/edxapp/defaults/main.yml
Merge pull request #1675 from edx/feanil/djfs_defaults_release

Add sane defaults for djfs.
Merge remote-tracking branch 'origin/release' into feanil/release_into_master

Conflicts:
	playbooks/roles/datadog/tasks/main.yml
	playbooks/roles/rabbitmq/tasks/main.yml
Merge pull request #1677 from edx/feanil/release_into_master

Feanil/release into master
remote maintenance site.
Add s3 watcher plugin.

Here is an example vars.yml file to pass in when running the newrelic role
with s3watcher enabled:

  ---
      S3_ACCESS_KEY_ID: s3accesskeyid
      S3_SECRET_ACCESS_KEY: s3secretkey
      S3_BUCKET_NAME: bucketname
      AWS_REGION: us-foo-1
      S3_CONFIG_FILENAME: fooconfigfile
      NEWRELIC_S3_WATCHER: True
      NEWRELIC_LOGWATCH: False <--not a required var, but it's True by default
      NEWRELIC_LICENSE_KEY: "my_api_key"
adding override for OAUTH_ENFORCE_SECURE
Merge pull request #1671 from edx/benp/new-relic-s3-plugin

new relic s3 plugin