Fixes #5997: add missing body u_bootstart into initial promises
Merge pull request #613 from ncharles/bug_5997/dev/add_u_bootstart

Fixes #5997: add missing body u_bootstart into initial promises
Fixes #5998: don't overexpand path for local inventory generation in initial promises
Merge pull request #614 from ncharles/bug_5998/dev/wrong_path_for_inventories

Fixes #5998: don't overexpand path for local inventory generation in ini...
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0