Sahara support to Packstack in time for Juno

Change-Id: Ic5381aede97d03d79151700afa3257ae8b1fd277
(cherry picked from commit 2edd3aeba85566b68d6cc8edc0fafc47380a577c)
Merge "Sahara support to Packstack in time for Juno" into juno