Merge branch 'stable-2.15' * stable-2.15: Fix name of commons-net dependency Remove drafts related code Fix name of commons-net dependency Change-Id: I31b276e8dc3012fce1d0f4ac9e6da94db462efe2