Save compelte conf dir rather than specific files

Change-Id: I3d2016a9dcd0e34761008dc75bc59d712d39c219
Update functions file from DevStack

Change-Id: Iac97e09db1f40e76d61164971147b307fc26b3ad
Merge "Update functions file from DevStack"