intellidemand: sync with Hammerhead Intellidemand 5.0

Change-Id: I6f6ff4c147ca87bcbaf874ec0c2daaa779b31c0a
Signed-off-by: Paul Reioux <reioux@gmail.com>