Copy policy_add() from Grenade functions

Change-Id: Ifd852e9d1ffe39fa23f6312d1ddf2874b5f2b9f0
Merge branch 'docker' into dt-test
Merge branch 'policy-function' into dt-test