Move the tracking logs to their own directory
Merge pull request #1420 from edx/e0d/move-tracking-logs

Move the tracking logs to their own directory
New config format for the modulestore.
These services get stopped already.

They're in here twice.
Merge pull request #1421 from edx/feanil/stop_services_once

These services get stopped already.
CMS needs mappings even if it's empty.
Merge pull request #1422 from edx/feanil/update_edxapp_configuration

New config format for the modulestore.
settings max-requests
typo
typo
Merge pull request #1423 from edx/jarv/max-req

settings max-requests
convert integer to string
Merge pull request #1424 from edx/jarv/max-req

convert integer to string
# This is a combination of 2 commits.
# The first commit's message is:

Changing out dollar vars for {{

Reverting back to dollar sign for json configs

# The 2nd commit message will be skipped:

#	Testing errors
Changing out dollar vars for {{

Reverting back to dollar sign for json configs
# This is a combination of 5 commits.
# The first commit's message is:
Changing out dollar vars for {{

Reverting back to dollar sign for json configs

# The 2nd commit message will be skipped:

#	Testing errors

# The 3rd commit message will be skipped:

#	Testing

# The 4th commit message will be skipped:

#	Testing

# The 5th commit message will be skipped:

#	Testing
Changing out dollar vars for {{

Reverting back to dollar sign for json configs