separate works for py27, py35 add docs test some other changes to let tests pass Change-Id: I94291a5e65fee1e266fbe4e2ec3e14f042654598