Handle CherryPy3 being the default on sys.path

Change-Id: Ie6e4f58cbb08508cac4e12acd21e4f2f28ea5d38
Merge "Handle CherryPy3 being the default on sys.path" into develop