Remove cldemo promises on pkg uninstall
Merge branch 'cf-ospfunnum2s' of github.com:CumulusNetworks/cldemo into cf-ospfunnum2s

Conflicts:
	pkgs/workbench/cldemo-wbench-ospfunnum-base-cfengine/debian/DEBIAN/prerm
	pkgs/workbench/cldemo-wbench-ztpbasic-1s-cfengine/debian/DEBIAN/prerm