Merge pull request #320 from wmathurin/unstable20

Entity framework tests now being run from Android container
Merge pull request #321 from wmathurin/unstable20

Updated token / more time for some tests that were failing