Upgrading S3 pluging to 0.6
Move kibana nginx template to correct location
Merge pull request #1617 from edx/cg/mv_kibana_template

Move kibana nginx template to correct location
Merge pull request #1595 from edx/han/jenkins_admin

Upgrading S3 pluging to 0.6
Add port support for kibana configuration
For SSL, should have been SSL port
Merge pull request #1618 from edx/cg/add_port_to_config

Add port support for kibana configuration
Correct the syntax for the rabbitmq config file.
Correct the default settings for un-clustered mode as well.
Merge pull request #1621 from edx/feanil/fix_rabbit_config

Correct the syntax for the rabbitmq config file.
Remove ora from fullstack.
Merge pull request #1622 from edx/feanil/fullstack_ora

Remove ora from fullstack.