Fix flux plugin 'login' link on CF (Bug 443531)
Merge branch 'master' into cf-deploy

Conflicts:
	.gitignore
Increase timeout because CF Java client can take a long time to respond
No longer cache orion-node's edit/edit.html to allow consistent flux auth check on loading orion UI.