Merge pull request #1023 from davidcunado-arm/dc/update_userguide

Migrate to Linaro release 17.04