Merge "Upgrade E2Mgr spec to version 2.0.5 of 2019-09-11"

diff --combined .gitignore
index 27ad92d,ecc268e..2bfa4fa
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -16,6 -16,7 +16,7 @@@
  /.settings
  /target/
  /.mvn/wrapper/maven-wrapper.jar
+ /.tox
  
  ### STS ###
  .apt_generated
@@@ -46,6 -47,3 +47,6 @@@
  
  # OSx cruft
  **/.DS_Store
 +
 +# documentation
 +.tox

diff --combined docs/.gitignore
index 89d0765,f6b991e..173f8dc
--- 1/docs/.gitignore
--- 2/docs/.gitignore
+++ b/docs/.gitignore
@@@ -1,2 -1,3 +1,3 @@@
 -/conf.py
 +/_build
  /out
+ /_build