Added logic to honor the enable_embedded_es attribute for servers
Merge pull request #283 from dgivens/embedded_es

Added logic to honor the enable_embedded_es attribute for servers