14.01: apply updates from ARM

Email comments applied re: Thomas Jacob's email.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>