Includes Shawna Guilianelli: fixMerge branch 'master' of https://github.ibm.com/alchemy-writers/appid and more...

[alchemyDocs]

See the Commits and Files changed tabs for more information about what is included in this pull request.