Merge from OS#5

santipalenque wants to merge 12 commits into

fntechgit:masterfntechgit/summit-admin:masterfrom

OpenStackweb:masterOpenStackweb/summit-admin:masterCopy head branch name to clipboard