Feanil/update integration

@jarv @e0d  These changes should fix the continuous integration environment and the ansible sandboxes.  I updated jenkins to point to this branch for now so it should be changed back to master wen we merge this in.