nova-consoleauth start failed by consoleauth_manager option missing 

Miss onsoleauth_manager option importing caused nova-consoleauth service
start failure: "NoSuchOptError: no such option: consoleauth_manager".

Fixes bug: 1164845

Change-Id: I59a15a423f49ee6c28401f905b4973c2231faaa6
Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
Merge "nova-consoleauth start failed by consoleauth_manager option missing "
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp